mpm@selenic.com [Thu, 14 Jul 2005 22:56:55 -0800] rev 705
Merge with TAH
manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 22:51:47 +0100] rev 704
Make makelock and readlock work on filesystems without symlink support.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make makelock and readlock work on filesystems without symlink support.
This way you can have a repository on a fat partiton, e.g. a USB stick.
manifest hash: cea2c120ef2b25a50c5d98b59648f773feefe470
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1t5yW7P1GVgWeRoRAsKjAJ9BFcn/EqBK/dmJ4BY1pPIZIbDDJACghN3p
VCQS6CJ72MHpzhOOsnOpHzE=
=laDT
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 17:28:19 +0100] rev 703
merge program setting from hgrc wasn't used.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge program setting from hgrc wasn't used.
manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd
Xr+Tb86zo+xFhHq7YkDvLak=
=+BY9
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 17:22:20 +0100] rev 702
Fix default values and add interactive setting to [ui] section of hgrc docs.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix default values and add interactive setting to [ui] section of hgrc docs.
manifest hash: 211eea218970b45b2a0cdc822d5b6610a89ffbd7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1pE8W7P1GVgWeRoRAof+AJ4mpm3DCRqh+9To3Gn4bpC7UGcTnQCfVIWN
5VT9pqdP6/06tH8nYgW55f4=
=uNyy
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 16:57:01 +0100] rev 701
On importing the result of 'hg export', parse while reading and drop headers.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On importing the result of 'hg export', parse while reading and drop headers.
manifest hash: 385cb4205bb6e4291a412d740400de44bd2e4014
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1otNW7P1GVgWeRoRAiSpAJ4jGhjyEnI2aqCM6pgC8KWSWRkDugCgkVMK
rd/YNziDK3TNRhI3yKNrLVw=
=w6ht
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 16:23:13 +0100] rev 700
Removed extra spaces for default parameters according to PEP8.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Removed extra spaces for default parameters according to PEP8.
manifest hash: 0f6bcc95adf406c8f6dafd92b7c7d3523b6dfe2c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1oNhW7P1GVgWeRoRAn76AJ4m8rFUeeUDRC0qVEmjjmPClmAFsQCdE3rN
Juv2dSoGteRm0DBXz7xnF4c=
=PMki
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 15:56:11 +0100] rev 699
Removed duplicate use of os.path.normcase().
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Removed duplicate use of os.path.normcase().
manifest hash: cccacfb66a4de9abc20095b28e6bab9b51dc4fa9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1n0LW7P1GVgWeRoRAueGAJ9256Jiwv4QbrFIV3Px/SmBMkddjQCbBop/
J2Yi2np72OAKVPhFhCijH6s=
=aAyf
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 15:30:49 +0100] rev 698
Use python function instead of external 'cp' command when cloning repos.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use python function instead of external 'cp' command when cloning repos.
Inspired by a patch from Stephen Darnell.
manifest hash: b525b0bf40f349b362db7c46d62be41572ef65cf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1ncZW7P1GVgWeRoRAiJmAJ9GaCPaG6yOKb72I+SpDDdcdXTISACePD0H
GR/F+qqzi2imdgIV77ziLcQ=
=YVd2
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 10:42:28 +0100] rev 697
Multiple cleanups of things detected by pylint.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Multiple cleanups of things detected by pylint.
Spacing, multiple statements on a single line, overloading builtins,
except statements without exception type, unused variables, etc.
manifest hash: 457b33b30200d9f71ca707a0bef78053d9091107
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1jOEW7P1GVgWeRoRApr5AJoClL7FkGXT9Z36xF71zdVH463O0wCeJJwb
gJSn0jHlLZ3m25OI+BuZCrI=
=HVDq
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 10:37:33 +0100] rev 696
Removed extra newline in hg log when not using the --patch option, fixed tests.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Removed extra newline in hg log when not using the --patch option, fixed tests.
manifest hash: 4d83d4af68581affe4cd2dacf840ec78bf18311e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1jJdW7P1GVgWeRoRAkoIAJ4kI8WFisp8fJTMsUCddLwK0O1mHQCgj+fx
XDIXrDpUULYSSck3eD4QHY4=
=jKKB
-----END PGP SIGNATURE-----
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Jul 2005 08:57:54 +0100] rev 695
Fixed tests.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fixed tests.
manifest hash: f6f36e6f95ea99efccc84dfa1d0af63d414a0eba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1hsCW7P1GVgWeRoRAtbyAJoDpbSygoutryu3P/miCpX2Q/LA8gCgiClo
P+1ZpH0gycio/V4CKmj5Hlo=
=JVBT
-----END PGP SIGNATURE-----
mpm@selenic.com [Thu, 14 Jul 2005 22:37:46 -0800] rev 694
Teach convert-repo about tags
Git tags are bad, very bad. More importantly, they're horribly
inconsistent. This drops tags which don't appear to work like most of
the others.
manifest hash: f2dda9e9a3ae8a0d84b19e496059b8a795b8e603
mpm@selenic.com [Thu, 14 Jul 2005 18:41:36 -0800] rev 693
Be quiet about broken pipes
manifest hash: 3163ebe2f15c3a577456cfdcd2b136c3c7cf7378
mpm@selenic.com [Wed, 13 Jul 2005 01:53:27 -0800] rev 692
convert-repo: deal with packed git and other fixes
call out to git-cat-file directly to deal with packed files
use git-diff-tree --root to handle import of first commit
quiet some dirstate warnings
fix parent logic in commit
whitespace bits
topological sort fix
manifest hash: 2943af0168dd2f5e85bba6515fd08687e264863f
mpm@selenic.com [Wed, 13 Jul 2005 01:48:03 -0800] rev 691
HG environment variables take precedence over hgrc
manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810
mpm@selenic.com [Wed, 13 Jul 2005 01:46:50 -0800] rev 690
Minor merge fixups
return a proper errorlevel on abort
let force jump across branches
catch exception on unlink
manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa
mpm@selenic.com [Wed, 13 Jul 2005 01:42:48 -0800] rev 689
Make manifest lookup use changeset ids
manifest hash: 83cf1ac9c68ad9e8de29d2c629c8a06eaeeeae15
mpm@selenic.com [Wed, 13 Jul 2005 01:41:49 -0800] rev 688
Repair the hgweb search interface
manifest hash: f5c644f14b31da897dc66f96c2852ae1f11f43f1
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2005 20:55:42 -0800] rev 687
Hide file hashes in log
There are six different kinds of revision numbers and hashes:
changeset hash and local number
manifest hash and local number
file hash and local number
We really ought to expose only the changeset hash and local number, so
begin hiding the others from the end user
manifest hash: 40d07cc930e84a9283d5e03ade23e3454401e148
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2005 00:51:49 -0800] rev 686
Reapply startswith() changes that got lost with stale edit
manifest hash: 16d7feedd561591a21727a4c13a1223019d802a7
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 21:58:57 -0800] rev 685
Added tag 0.6b for changeset 4ccf3de52989b14c3d84e1097f59e39a992e00bd
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 21:56:29 -0800] rev 684
Turn off signing with hgeditor by default
manifest hash: f2732475351ee22d78e0dab629db03f1f215b21f
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 21:54:37 -0800] rev 683
Revert hgeditor change to manifest bits
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Revert hgeditor change to manifest bits
I'd rather have a blank line at the top.
This code primarily exists to show possible methods of signing
changesets so I'm not very concerned about conciseness or performance.
I should probably have all the signing commented out or disabled by
default.
manifest hash: 764da8d65bdaf9b45c7e3efd6cd2b4ee70979417
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC01sdywK+sNU5EO8RAr2BAJ9Uq0XberFrYyehvmoKgE8p/j0XFQCdFPJr
DPDMbKeBHwK/yMiileBFW8o=
=DvnD
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 21:51:06 -0800] rev 682
Revert hgeditor md5sum change
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Revert hgeditor md5sum change
My copy of md5sum doesn't do --status
manifest hash 509a316ca72aca095c590fb120eb2ee8260814dd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC01pKywK+sNU5EO8RAkDWAJ0dWHz3Vp5oR2be9k3d1Km2Br53xgCgrBLF
Ja2tOYCu/nP4sh3CsOsIO78=
=zHkj
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 15:07:04 -0800] rev 681
Sort files for removal
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 15:06:32 -0800] rev 680
Handle undeletion of files when checking out old revisions
Spotted by Marc Singer
Matt Mackall <mpm@selenic.com> [Mon, 11 Jul 2005 10:28:20 -0800] rev 679
Actually move .hg into ignore
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 17:11:27 -0800] rev 678
Alternate fix for SIGHUP on the other OS
Suggested by K Thananchayan
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 16:19:36 -0800] rev 677
Fix up test for update flags
Andrew Thompson <andrewkt@aktzero.com> [Sun, 10 Jul 2005 16:17:05 -0800] rev 676
Remove references to 'cloning by hardlink' from tests.
# HG changeset patch
# User Andrew Thompson <andrewkt@aktzero.com>
# Node ID c12a49438454e9782ff7eb9b11841e7b9406fbab
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
Remove references to 'cloning by hardlink' from tests.
Mikael Berthe <mikael@lilotux.net> [Sun, 10 Jul 2005 16:15:20 -0800] rev 675
hg clone stored path fix
# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Node ID a08808d8ffd811c1174216c598da5c27d20bc2c9
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
hg clone stored path fix
The abspath() has been lost in changeset 634 (da5378d39269).
chad.netzer@gmail.com [Sun, 10 Jul 2005 16:14:56 -0800] rev 674
Make consistent use of str.startswith() in conditionals.
# HG changeset patch
# User chad.netzer@gmail.com
# Node ID 45db196de89a15fd045cd789f701b0180fd276f1
# Parent fafc16f705b6cb413897577b67918af55e1baafe
Make consistent use of str.startswith() in conditionals.
Andrew Thompson <andrewkt@aktzero.com> [Sun, 10 Jul 2005 16:14:41 -0800] rev 673
Change MANIFEST.in to recursive-include the contrib/ folder.
# HG changeset patch
# User Andrew Thompson <andrewkt@aktzero.com>
# Node ID e5dc09266c217bc50b91d710a045c679411e4727
# Parent c55df1c38618035c8e94e7af025e2b7f38f6d743
Change MANIFEST.in to recursive-include the contrib/ folder.
Now sdist picks up git-viz again.
Edouard Gomez <ed.gomez@free.fr> [Sun, 10 Jul 2005 16:14:28 -0800] rev 672
More IE friendly diff output related templates.
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 6eee9b54c53c41643192c7920db642c984a00a21
# Parent 8b8f710bb65875d588044c3615cf42180aee23ff
More IE friendly diff output related templates.
I thought i could use CSS to render properly the diff blocks in IE.
But i was obviously too optmistic and didn't realized that IE only
renders preformated text for pre tag content...
So i had to rollback some of my changes to accomodate to this IE
bug/limitation. A diff blocks become pre tags, and diff lines
become span again. Hopefully, the pages continue validating.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 10 Jul 2005 16:14:06 -0800] rev 671
Move hgrc documentation out to its own man page, hgrc(5).
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 5076cf1fd6a1b8eb410e5e03cb004ca6a52a30f9
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
Move hgrc documentation out to its own man page, hgrc(5).
The new man page expands on the existing documentation by describing
the file format and the purpose of each section and field.
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 16:13:39 -0800] rev 670
Move .hg into ignore()
mwilli2@localhost.localdomain [Sun, 10 Jul 2005 16:03:20 -0800] rev 669
.hgignore speedups patch incorporating Matt's feedback.
# HG changeset patch
# User mwilli2@localhost.localdomain
# Node ID c78a9d4398c63b6bc689e456e1cab3850a846c8a
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
.hgignore speedups patch incorporating Matt's feedback.
Edouard Gomez <ed.gomez@free.fr> [Sun, 10 Jul 2005 16:02:39 -0800] rev 668
Dont trap SIGHUP on the other OS
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 34a547cb33fe515ef4cdc8ccd173546671253ae9
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
Dont trap SIGHUP on the other OS
HG doesn't work anymore on the other OS since signals are trapped.
This is due to the fact that as explained in Python docs not all
signals are defined for all platforms, so python was complaning about
missing signal.SIGHUP.
mark.williamson@cl.cam.ac.uk [Sun, 10 Jul 2005 16:01:11 -0800] rev 667
A number of minor fixes to problems that pychecker found.
# HG changeset patch
# User mark.williamson@cl.cam.ac.uk
# Node ID 55d38977b7f2e73b8c1090179928ac96c8922b90
# Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d
A number of minor fixes to problems that pychecker found.
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:56 -0800] rev 666
hgeditor: Remove EMAIL default for HGUSER, comment editor selection
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID a4c688c8273e392b1bf33cfc736e00ec752a415e
# Parent be12687d4bf0ce16c4207bef85c188de66efbf53
hgeditor: Remove EMAIL default for HGUSER, comment editor selection
HGUSER is already set to EMAIL by Python code if needed
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:49 -0800] rev 665
hgeditor: Remove temporary files even if interrupted
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 1292f1fd015767d9682ba2ff5f8377fb6760c3a5
# Parent a4c688c8273e392b1bf33cfc736e00ec752a415e
hgeditor: Remove temporary files even if interrupted
Index: hg/hgeditor
===================================================================
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:30 -0800] rev 664
hgeditor: Simplify manifest hash adding
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID be12687d4bf0ce16c4207bef85c188de66efbf53
# Parent 341d27f865903223f8bf12382e3596167228a1c1
hgeditor: Simplify manifest hash adding
I hope no one will miss the colon.
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:24 -0800] rev 663
hgeditor: Fix some parameters to commands
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 341d27f865903223f8bf12382e3596167228a1c1
# Parent 5c5d1484b51a53918575a199ab8985160f0ce2d7
hgeditor: Fix some parameters to commands
Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> [Sun, 10 Jul 2005 16:00:17 -0800] rev 662
Pass username to hgeditor, remove temporary file
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 5c5d1484b51a53918575a199ab8985160f0ce2d7
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
Pass username to hgeditor, remove temporary file
kreijack@inwind.REMOVEME.it [Sun, 10 Jul 2005 15:59:26 -0800] rev 661
Add rss tag in the changelog/filelog html template.
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 20edcc82038fce8460076ca5723fbbb919016356
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
Add rss tag in the changelog/filelog html template.
This patch add rss tags in the changelog/filelog template
html pages. This tags permit the browser to detect the rss feed.
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 14:07:14 -0800] rev 660
Move commit hook after commit completes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Move commit hook after commit completes
manifest hash: bc65b570af67ee4748efaba2ff8a6cddf91b8a14
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0ZwSywK+sNU5EO8RAuAjAJsHGTXsOCnxq+xbq/Q0H+ayGnzaiQCfdWn6
or+IWK3sjYILYncTxMFZJdE=
=mQb7
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 14:06:30 -0800] rev 659
Whitespace cleanup
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Whitespace cleanup
manifest hash: 7abcbe23247dd5b7dea6fa44fb80d9f909cf6829
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0ZvmywK+sNU5EO8RAhhDAJ0YXOx5B2F/3NjFB+5YcUtkHqVyuQCgnNyp
tWbRrjDz/SbKz/tFAsxJDqo=
=xB66
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 10:38:50 -0800] rev 658
Generate a friendlier except for failed lookups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Generate a friendlier except for failed lookups
manifest hash: 1a4384b791bba2107604e56168166dfcbfb54086
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0Ws6ywK+sNU5EO8RArBGAJ9EA0mCNGqO+w6LaO358sVe19o7lQCdGffF
MmQ/ZIvxoJOjYTo+PLBWMqI=
=4VIg
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sun, 10 Jul 2005 10:06:54 -0800] rev 657
dirstate.forget() takes a list
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
dirstate.forget() takes a list
manifest hash: e444474a5ac76d3562ee8c0211e1a88ec53155ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te
e8ZI236WNWfyrwEASxFIeLM=
=yDVZ
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Sat, 09 Jul 2005 18:11:54 -0800] rev 656
Warn about bogus ignore expressions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Warn about bogus ignore expressions
manifest hash: 7beb33a1f0879a1d2457953187a523417bc7a101
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFC0IPqywK+sNU5EO8RAsOdAJ0bFxZoUjSk/BxWZ9C50SlxlDBlBQCeKbu0
QVzZZKIFlDRVWOsi8zfamHA=
=zAVL
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 18:10:57 -0800] rev 655
Fix out of range regression
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix out of range regression
From: Filip Brcic <brcha@users.sourceforge.net>
The old revlog.py issued "index out of range" error when cloning the repository
Now I have reverted the parts of revlog.py to the old state when prev was
initialized as -1 and later assigned self.tip() only if that is possible.
Previously prev was always initialized as self.tip() and that is where the
out of range error was.
manifest hash: c94c9aee8b6d382ef52c3981f306a6e7e5f4c4d1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzzIxywK+sNU5EO8RAtlcAJ0TX9FXuC2c3YHuYXNwqZhdzPWUlgCggq+a
yJzUKDKH/gvnD3Tx3jcmCn8=
=euPi
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 13:35:02 -0800] rev 654
Make cloning by hardlink quiet again
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make cloning by hardlink quiet again
manifest hash: bd12b4deedb99e06415619f858b95b566a6d329e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzvGGywK+sNU5EO8RAiCzAJ9iCRbyijLT7PqkgCI9eFn+9pl+KQCfdcB1
yHxfvLCL39wAAcBo6Hebpvo=
=qne+
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 13:21:22 -0800] rev 653
Fix corruption resulting from skipping parts of a revision group
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix corruption resulting from skipping parts of a revision group
We were occassionally losing track of what revision a delta applied to
when we skipped over deltas we already had and applying the delta
against the wrong base. This could result in coredumps from mpatch,
consistency errors, or failed verify.
manifest hash: fcf20a8abfd81f08fae2398136b2ed66216b2083
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzu5SywK+sNU5EO8RAi10AJ9cqIfQzOzbcdH36t1LR/rY+UMtHwCeM79p
Dtv+Jh0McLZr6nf4iJyhDgI=
=5o6U
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 00:14:47 -0800] rev 652
Non-grouping regex for ignore
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Non-grouping regex for ignore
Suggested by Mark Williamson
manifest hash: dfd4686e7ac9f96e79da600edf299ed64213e05d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzjX3ywK+sNU5EO8RAnc1AJ4/sKzyZJiRs6UzE3uksE2U9rOkVQCeJsZf
PhHsNtEt/WyL+v44mBfk8Mk=
=e+Qy
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 00:07:54 -0800] rev 651
Fix an odd revlog bug
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix an odd revlog bug
If revlog had a cached -empty- revision, as opposed to no cached
version, it could get confused. This cropped up in verify on a
particular repo.
manifest hash: 90ccf122087f6bbcb4322cb9d9bb8124610ba886
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzjRaywK+sNU5EO8RAgVEAKCv3WBJt1rBOX0UlTDXFPygPIru+gCfTZxJ
CEz1lYny1gkQ+haGY26QdBs=
=C/K5
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Fri, 08 Jul 2005 00:04:25 -0800] rev 650
Fix bug in reverting deleted files
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix bug in reverting deleted files
Force updates and reverts wouldn't restore deleted files in the
working dir. This should fix that.
manifest hash: e14809399bbc63da42e8c8f694cc8acf31e537f7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr
sADRnovYt9xSnUGmd1Om9JQ=
=SdcP
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Thu, 07 Jul 2005 09:41:03 -0800] rev 649
Experimental ignore regex speed-up
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Experimental ignore regex speed-up
manifest hash: c6922086fb78201b60ba8cbde5b51512225ebcc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzWkvywK+sNU5EO8RAohzAJ9BwkFJQzs0QRH71r1Y1Wm0QCSmEwCgrESQ
Ej3Kt/y0JdhOJzQLsAiufqk=
=SPjY
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:41:56 -0800] rev 648
Attempt to read all remaining remote output at close
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to read all remaining remote output at close
manifest hash: e1eda33686726559849388b048a838933862fe89
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzM60ywK+sNU5EO8RAudsAJwPW/MPUBXFV13UbYmZyiwdzSr8QwCfYJqc
l1ZDWPZPTN5UGUlfs0CCu7Y=
=2Tat
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:37:06 -0800] rev 647
update test-hup permissions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
update test-hup permissions
manifest hash: a041df3958fb7508e34ce7c736c196217bbcf8a7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzM2SywK+sNU5EO8RAnKvAKC1+ilD53KpBwplk5iaUMra4h3GDgCgsM4f
R+RswPBjW8I51vNyvZ45AvM=
=dQjV
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:30:00 -0800] rev 646
Show remote client output with "remote:"
kreijack@inwind.REMOVEME.it [Wed, 06 Jul 2005 22:28:50 -0800] rev 645
this patch permits hgweb to show the deleted files in the changeset diff
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 08b33970007e753f12b2b2f9d0e169981a6e8c3c
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
this patch permits hgweb to show the deleted files in the changeset diff
mason@suse.com [Wed, 06 Jul 2005 22:28:35 -0800] rev 644
Performance enhancements for manifest.add()
# HG changeset patch
# User mason@suse.com
Performance enhancements for manifest.add()
Improve manifest.add performance by using bisect to insert/remove
changed items into the manifest list. This also generates the
manifest delta directly based on the changes being made.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:27:53 -0800] rev 643
typo in help message.
From: "Aneesh Kumar K.V" <aneesh.kumar@hp.com>
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:27:25 -0800] rev 642
Update tests
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:27:07 -0800] rev 641
Catch SIGHUP
This should reduce the chance that a repo we're connected to via ssh
gets interrupted without doing rollback.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:25:40 -0800] rev 640
Switch push over to the new scheme
Now push works transparently with any repo with lock and
addchangegroup. Currently this is local repos and ssh.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:23:57 -0800] rev 639
Add addchangegroup to the ssh protocol
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:23:27 -0800] rev 638
Add a scheme for handling remote locking
This adds an object that remembers to unlock the remote repo on
destruction and lock/unlock functions for the ssh protocol. The remote
repository should also unlock itself when the connection goes down.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:21:23 -0800] rev 637
Fix up the broken bits in findoutgoing
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:20:56 -0800] rev 636
Move the empty changeset detection out of findincoming to pull
This lets us reuse findincoming for findoutgoing
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:20:12 -0800] rev 635
Protocol switch from using generators to stream-like objects.
This allows the the pull side to precisely control how much data is
read so that another encapsulation layer is not needed.
An http client gets a response with a finite size. Because ssh clients
need to keep the stream open, we must not read more data than is sent
in a response. But due to the streaming nature of the changegroup
scheme, only the piece that's parsing the data knows how far it's
allowed to read.
This means the generator scheme isn't fine-grained enough. Instead we
need file-like objects with a read(x) method. This switches everything
for push/pull over to using file-like objects rather than generators.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:14:10 -0800] rev 634
Add a repo method to report repo device
This is used to establish whether repos are on the same device for
hard linking. Remote repos all return -1.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2005 22:11:54 -0800] rev 633
Slim down and update README a bit
thananck@yahoo.com [Tue, 05 Jul 2005 18:23:56 -0800] rev 632
Provides output option to cat command
# HG changeset patch
# User thananck@yahoo.com
# Node ID c838b9c2c71b1d64b8bde786f6470b30f23962de
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
Provides output option to cat command
expand function in commands.doexport is moved to toplevel and renamed
to make_filename. The 'cat' command now accecpts --output <pattern>
switch to specify the destination file.
Index: hg/mercurial/commands.py
===================================================================
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 05 Jul 2005 18:23:34 -0800] rev 631
Update documentation of hg tag
# HG changeset patch
# User Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
# Node ID 8fc9bfabae06cba91b05c265545bcce2654dab2f
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
Update documentation of hg tag
This updates the FAQ, manpage and adds hg tag to the list of commands
in README.
Index: hg/README
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Tue, 05 Jul 2005 18:22:28 -0800] rev 630
Remove debug print from locate code.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 5240abb57899b745f2e6465be29d9d54c4777364
# Parent 13b74665cbdf735a91f231956d0fe73e446340ea
Remove debug print from locate code.
Index: hg/mercurial/commands.py
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Tue, 05 Jul 2005 18:22:22 -0800] rev 629
Clarify man page entry for locate a little.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 13b74665cbdf735a91f231956d0fe73e446340ea
# Parent fb74eaa2b5b763ad5591b2e51dbb377bf8342064
Clarify man page entry for locate a little.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 05 Jul 2005 18:19:22 -0800] rev 628
Use repo.getcwd() in a few obvious places.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID fb74eaa2b5b763ad5591b2e51dbb377bf8342064
# Parent ebf5eba347a17a5c09000b3342caf350cd060a1b
Use repo.getcwd() in a few obvious places.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 05 Jul 2005 18:19:01 -0800] rev 627
Add locate command.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID ebf5eba347a17a5c09000b3342caf350cd060a1b
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Add locate command.
Used for finding files with names that match specific patterns,
such as "*.c".
This patch also introduces localrepository.getcwd, which returns the
current directory relative to the repository root.
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 18:15:38 -0800] rev 626
Fix quoting for RSS links
Spotted by Mikael Berthe <mikael.berthe@lilotux.net>
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 18:12:57 -0800] rev 625
Cleanups for repo.pull
Use repo.pull in pull and clone commands
Teach clone about ssh:// (temporarily)
Fix up shutil issue on failed pull
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 17:55:22 -0800] rev 624
Add an sshrepository class and hg serve --stdio
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 17:50:43 -0800] rev 623
Change remote repository to httprepository
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 17:50:02 -0800] rev 622
Add generic repo commands for pull and push
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2005 17:49:01 -0800] rev 621
Add a function to calculate the outgoing changegroup
Matt Mackall <mpm@selenic.com> [Mon, 04 Jul 2005 15:42:26 -0800] rev 620
Attempt to handle RSS URIs properly
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to handle RSS URIs properly
manifest hash: 1546939c11a8640ca56f0b0f5c7bdc878b4faa67
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCycliywK+sNU5EO8RAukgAJ9eoJdqTiTQ8xSsSeHMIBmHnnQk9QCfQpFL
SAJKUYknvv4IJDUyHjQc61k=
=zGdJ
-----END PGP SIGNATURE-----
Matt Mackall <mpm@selenic.com> [Mon, 04 Jul 2005 12:54:42 -0800] rev 619
update tests
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
update tests
manifest hash: 70079385599132ca8f90582e1f9317ca46167532
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyaISywK+sNU5EO8RApnGAJ0blIxE0tKPzcRQUDAHCLe5KmUSNgCgjGoA
kV4Os9FG1NmGaCysPIsKwts=
=Ee67
-----END PGP SIGNATURE-----
Bryan O'Sullivan <bos@serpentine.com> [Mon, 04 Jul 2005 12:39:35 -0800] rev 618
Handle unrecognised options correctly.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 837a023781a0228e5791e8e278129d2d54d13f99
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Handle unrecognised options correctly.
thananck@yahoo.com [Mon, 04 Jul 2005 12:39:21 -0800] rev 617
open .hgtags as binary
# HG changeset patch
# User thananck@yahoo.com
# Node ID 2bd20bb06f817796d76b8e126f4a685426c4faf4
# Parent 7a240687674e6cf5a8dfd45973d7e3978b89af79
open .hgtags as binary
The '.hgtags' file, in tag command, is opened as binary for interoperability with the other OS
maf46@burn.cl.cam.ac.uk [Mon, 04 Jul 2005 12:38:34 -0800] rev 616
Fix zombie files in merge
# HG changeset patch
# User maf46@burn.cl.cam.ac.uk
# Node ID 57667c9b93a5a743e4629d15a0e6bd76699130c3
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Fix zombie files in merge
Keir Fraser observed the following:
> I made a small test case that illustrates the bug in merging changesets
> with 'hg remove's in them:
>
> 1. Create a repository A containing files foo & bar.
> 2. Create clone called B.
> 3. A removes file bar, and commits this removal.
> 4. B edits file foo, and commits this edit.
>
> Now, if B:
> # hg pull ../A; hg update -m; hg commit
> Then bar remains deleted.
>
> If A:
> # hg pull ../B; hg update -m; hg commit
> Then bar is resurrected!
>
> It looks as though, when you merge across a branch, any deletions in
> your own branch are forgotten.
> ...
> Fixing this is a must, as zombie files are a real pain. :-)
Keir later patched our local copy of hg as shown below, which fixes
the problem. I've also enclosed a test which captures the test Keir
outlined...
Files deleted on a branch should not automatically reappear in a merge
Patch notes:
1. The first chunk does not change behaviour, but cleans up the code
to more closely match check of 'force' in the second chunk. I
think it makes the code clearer.
2. The second chunk fixes two bugs --
i. If we choose to keep a remotely-changed locally-deleted file,
then we need to 'get' that file. If we choose to delete it
then no action need be taken (it is already deleted in the
working manifest). Without this fix, choosing to delete would
get a Python traceback.
ii. The test for whether the file was remotely-created is
insufficient. It is only true if f is not in the common
ancestor. Otherwise the file was deleted locally, and should
remain deleted. (this is the most important fix!)
Index: hg/tests/test-merge6
===================================================================
thananck@yahoo.com [Mon, 04 Jul 2005 12:22:21 -0800] rev 615
Output file of 'export' is opened as binary (other OS)
# HG changeset patch
# User thananck@yahoo.com
# Node ID 7a240687674e6cf5a8dfd45973d7e3978b89af79
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Output file of 'export' is opened as binary (other OS)
Matt Mackall <mpm@selenic.com> [Mon, 04 Jul 2005 12:18:58 -0800] rev 614
Stop patch description import at diff -r
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Stop patch description import at diff -r
manifest hash: cc269f69c26ad4fba1fdaeefe2dc8191a0669fe0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyZmyywK+sNU5EO8RAkODAJ9d/JYpBOZiOcQxlz0n2VtIPtK/IgCgl2Lj
caGbq4yn4RxzBQqqIoQzOTQ=
=9fHy
-----END PGP SIGNATURE-----
Bryan O'Sullivan <bos@serpentine.com> [Mon, 04 Jul 2005 12:16:27 -0800] rev 613
Demand-load most modules in the commands and ui modules.
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 059c6e42fc4221816e26a72bef8cf780891989ca
# Parent d2994b5298fb20f87dc1d4747635b280db3c0526
Demand-load most modules in the commands and ui modules.
This improves response times for a number of simple commands, as the
Python interpreter doesn't end up loading modules that it never uses.
There's less benefit to demand-loading in other modules.
Alecs King <alecsk@gmail.com> [Mon, 04 Jul 2005 12:15:44 -0800] rev 612
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
# HG changeset patch
# User Alecs King <alecsk@gmail.com>
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
> On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote:
> > Hg is really very nice. The only feature i miss from git is the
> > whatchanged -p, which shows a diff along with a changeset.
> > python before, i just dig into the mercurial/commands.py a while and
> > see what diff(), dodiff(), export(), show_changeset(), log() would
> > normally do. There might be one thing or two missed or wrong. But here
> > it is: a '-d' option to 'hg log' showing the diff info. You can use 'hg
> > log -d' to show the whole history with the diff or 'hg log -d <file>' to
> > show that info of a particular file. And also works with the '-r'
> > option.
>
> Let's use -p. We're going to be combining the global and per command
> switch namespace shortly and the global -p will disappear.
Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have
'hg log -p'.
> Also, the argument list for show_changeset is getting a bit unwieldy.
This time i remain show_changeset untouched at all. Only changed some
bits of log().
shaleh@speakeasy.net [Mon, 04 Jul 2005 11:20:20 -0800] rev 611
* clean up error handling when user requests to use a non file object
# HG changeset patch
# User shaleh@speakeasy.net
# Node ID 1ae21732349f5b6dba2941609a044d9c365a6fb2
# Parent 94744f6fe0e7c19b10fab7eb24249f3eeaa5489a
* clean up error handling when user requests to use a non file object
- use os.path.exists() to verify the item exists
- use os.path.isfile() to check whether the item is a file or not
diff -r 94744f6fe0e7 -r 1ae21732349f mercurial/hg.py
shaleh@speakeasy.net [Mon, 04 Jul 2005 11:06:01 -0800] rev 610
check export options for changeset before running
# HG changeset patch
# User shaleh@speakeasy.net
# Node ID 0cc64f4312540b2081c76dc589cc825d734676d8
# Parent f7bfe827ea381afc89f486b2d93d7f4fe86de04d
check export options for changeset before running
diff -r f7bfe827ea38 -r 0cc64f431254 mercurial/commands.py