Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:30:38 +0200] rev 5166
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Mon, 13 Aug 2007 11:58:47 -0700] rev 5165
imerge: simplify
1d5ebb0d366f
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5164
imerge: fix status file lookups
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5163
demandimport: ignore pwd and grp.
Both are unavailable under Windows and tarfile detects them via ImportError.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:50 +0200] rev 5162
util: ignore invalid path errors in path_auditor.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 12 Aug 2007 12:43:52 -0300] rev 5161
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:35:25 +0200] rev 5160
merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Fri, 10 Aug 2007 10:51:47 -0700] rev 5159
Make a few portability improvements to path auditing code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 10 Aug 2007 10:46:03 -0700] rev 5158
Make audit_path more stringent.
The following properties of a path are now checked for:
- under top-level .hg
- starts at the root of a windows drive
- contains ".."
- traverses a symlink (e.g. a/symlink_here/b)
- inside a nested repository
If any of these is true, the path is rejected.
The check for traversing a symlink is arguably stricter than necessary;
perhaps we should be checking for symlinks that point outside the
repository.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 20:16:00 -0700] rev 5157
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 20:03:34 -0700] rev 5156
debugstate: print symlinks as 'lnk', not '777'
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 19:42:33 -0700] rev 5155
manifest: accept -r for rev specification
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 17:29:16 -0700] rev 5154
record: improve docs, improve prompts
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:29:29 +0200] rev 5153
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 12:35:10 -0700] rev 5152
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 11:37:47 -0700] rev 5151
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 09 Aug 2007 01:07:11 +0200] rev 5150
merge with -stable
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 23:11:12 +0200] rev 5149
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 08 Aug 2007 23:00:01 +0200] rev 5148
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 08 Aug 2007 12:27:20 +0200] rev 5147
refactor options from cmdtable
- add extracommitopts for user and date
- factor stuff
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 15:57:23 +0200] rev 5146
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 12:24:25 +0200] rev 5145
raise util.Abort again if specified revision is not an integer.
This was changed to NoRepo in
462cc56d898f, because specifying non-integer
revisions for e.g. the Mercurial backend caused Abort to be raised in the
subversion importer.
Now util.Abort is raised again, but the check is done after verifying if it
really is a subversion repository.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 12:10:56 +0200] rev 5144
debugsvnlog call had too many quotes (found by Edouard Gomez)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:28:43 +0200] rev 5143
Remove trailing spaces, fix indentation
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:28:14 +0200] rev 5142
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:01:20 +0200] rev 5141
Removed debug print from convert/subversion.py
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:56:21 +0200] rev 5140
Replace _ with inst for catching exceptions to not shadow gettext.
And removed one _(...) because mercurial.i18n is not yet imported
in convert/subversion.py.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:49:07 +0200] rev 5139
Move debugsvnlog to subversion module.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:42:32 +0200] rev 5138
convert: Use debugsvnlog instead of git-like debug-svn-log.
Brad Schick <schickb@gmail.com> [Mon, 06 Aug 2007 14:50:57 -0700] rev 5137
extdiff: do single file diffs from the wc with no copy
Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.