Commit Graph

8278 Commits

Author SHA1 Message Date
Martin Geisler
50e87afefd gpg: use reverse kwarg to sort sigs in reversed order 2009-05-07 01:33:45 +02:00
Martin Geisler
97b9a7a062 util: simplify pipefilter and avoid subprocess race
The subprocess module is not thread safe. Spawning a thread to read
the output leads to exceptions like this when Mercurial exits:

  Exception exceptions.TypeError: TypeError("'NoneType' object is not
  callable",) in <bound method Popen.__del__ of <subprocess.Popen
  object at 0x9ed0dcc>> ignored

The bug is already reported in the Python bug tracker:

  http://bugs.python.org/issue1731717
2009-05-07 01:33:44 +02:00
Martin Geisler
e3185cd4af Removed unnecessary call to dict.keys. 2009-05-06 23:35:20 +02:00
Giorgos Keramidas
c555bd60d4 gpg: fix traceback in revs{} display code 2009-05-06 20:30:46 +03:00
Matt Mackall
01454e7a1b util: kill unused Popen3 2009-05-04 14:22:33 -05:00
Matt Mackall
ec94003cea config: make remap actually work 2009-05-04 14:21:43 -05:00
Martin Geisler
8fdb40802d util: stop overwriting sha1, overwrite _fastsha1 instead
Some modules (like revlog) would import util.sha1 as _sha1. This
defeats the purpose of having util.sha1 overwrite itself with a faster
version -- revlog would end up always calling the slow version. By
always delegating to util._fastsha1 we avoid this at the cost of an
extra (but unconditional) indirection.
2009-05-04 22:14:52 +02:00
Martin Geisler
6533e94352 util: remove md5
This hash function is broken and should not be used by new code. It is
currently only used by keepalive.
2009-05-04 21:30:39 +02:00
Sune Foldager
b19fc2c469 util: remove warnings when importing md5 and sha 2009-05-04 20:29:05 +02:00
Henrik Stuart
d0b7d204d4 transaction: refactor transaction.abort and rollback to use the same code
This adds a change to the way that abort is processed, as it will not continue
truncating files beyond the first failure, otherwise the respective
functionality is maintained, i.e. abort will not unlink files, but rollback
will.

Co-contributor: Sune Foldager <cryo@cyanite.org>
2009-05-04 15:31:57 +02:00
Henrik Stuart
b0183e01a2 test: change repair strip test to illustrate manifest errors 2009-05-04 13:47:12 +02:00
Benoit Boissinot
fdd0aa0449 verify: reference the correct linkrev when a filelog is missing
when a filelog is missing, the first bad revision is the first revision
where the filelog is referenced, not 0.
2009-05-04 19:51:08 +02:00
Henrik Stuart
fbd8e53ee1 verify: avoid exception on missing file revlog
Previously, accessing the filelinkrevs of a specific file that happens to
have already been unlinked from the filesystem, e.g. due to a partial rollback
having occurred, will trigger a KeyError being raised.

Co-contributor: Sune Foldager <cryo@cyanite.org>
2009-04-24 10:44:39 +02:00
Henrik Stuart
206e98a6fb transaction: reset transaction on abort
Prevent the use of the transaction after it has been aborted.

Co-contributor: Sune Foldager <cryo@cyanite.org>
2009-04-19 20:02:32 +02:00
Henrik Stuart
db9b1644e1 transaction: ensure finished transactions are not reused
All transactional methods on the transaction class have had a decorator
added that ensures the transaction is running.

Co-contributor: Sune Foldager <cryo@cyanite.org>
2009-04-24 09:56:53 +02:00
Simon Heimberg
b21a1df0f0 mq: simpler check of first character of guard name 2009-05-04 03:49:57 +02:00
Martin Geisler
15612f806b commands: fix capitalization in revert help text 2009-05-03 20:34:12 +02:00
Martin Geisler
a100fe0b6c setup: require Python 2.4 2009-05-03 17:36:58 +02:00
Patrick Mezard
8636bd4633 Merge with crew-stable 2009-05-03 13:49:04 +02:00
Alexander Solovyov
0e1b0cfac7 bisect: use subprocess to get command return code 2009-05-03 10:38:08 +03:00
Martin Geisler
4c6a32f451 setup: cleanup old left-over code 2009-05-03 00:41:09 +02:00
Martin Geisler
6f75deac3f localrepo: mark commit message template for translation 2009-05-03 00:20:08 +02:00
Martin Geisler
21ba2e96f6 util: initialize md5 and sha1 without using extra global variables
This lets the functions skip the "if _sha1 is None" test on each call.
2009-05-03 00:03:35 +02:00
Martin Geisler
11190d5aaa util: always use subprocess 2009-05-02 23:05:35 +02:00
Martin Geisler
60e8837e82 commands: describe --debug in showconfig help 2009-05-02 21:29:00 +02:00
Martin Geisler
7b8faf1ad9 color: look for mq with extensions.find 2009-05-02 21:09:37 +02:00
Martin Geisler
98fbeb0b9f write options in "-r/--rev" style in help texts 2009-05-02 19:13:29 +02:00
Martin Geisler
8e86ec908c i18n-da: translated various short messages 2009-05-02 17:48:01 +02:00
Martin Geisler
4d3f07511e i18n-da: removed fuzzy translations 2009-05-02 17:22:28 +02:00
Martin Geisler
c07e2ef4be i18n-da: synchronized with hg.pot 2009-05-02 17:03:16 +02:00
Mads Kiilerich
61b324eeb6 test-glog: Remove sed hack - '...$HGTMP...' isn't expanded anyway 2009-05-02 12:57:20 +02:00
Mads Kiilerich
9a2371955d test-convert-baz: hide GNU tar deprecation warning 2009-05-02 12:13:24 +02:00
Martin Geisler
17001eef4e Makefile: fixed comment 2009-05-02 12:10:38 +02:00
Martin Geisler
e0ae3d3d5f Makefile: add more meta data to hg.pot 2009-05-02 11:44:57 +02:00
Patrick Mezard
832313e290 rebase: fix bug where --keepbranches could leave wrong branch in dirstate
Report and original fix by Augie Fackler <durin42@gmail.com>
2009-05-01 12:26:37 +02:00
Richard Quirk
1652c239fa Add committer tag only when needed in git conversion
Convert from a git repo added a committer: tag in the log message
even if the committer and the author were the same person.
2009-05-01 11:32:19 +02:00
Patrick Mezard
c620d68ecc Merge with crew-stable 2009-05-01 12:35:13 +02:00
Steve Borho
83629eeaea simplemerge: use ui.warn() for warnings 2009-04-30 23:57:36 -05:00
Matt Mackall
83d555f0f7 config: add parse interface 2009-04-30 19:22:06 -05:00
Sune Foldager
2f3ee06863 util.rename: use temporary file name for rename-targets on windows
Use a temporary file name as target for a forced rename on Windows. The
target file name is not opened at any time; just renamed into and then
unlinked. Using a temporary instead of a static name is necessary since
otherwise a hg crash can leave the file lying around, blocking future
attempts at renaming.
2009-04-29 09:30:28 +02:00
Patrick Mezard
bd41c37f9b convert/svn: keep latest and not oldest tag value 2009-04-29 21:44:25 +02:00
Martijn Pieters
0a6e43e789 Fix typeerror when specifying both --rebase and --pull 2009-04-29 11:39:49 +02:00
Alexander Solovyov
c4db82ff74 zeroconf: guess ip for Zeroconf
Zeroconf() is actually pretty dumb in guessing IPs and in case of
socket.gaierror will not guess right IP.
2009-04-27 21:33:39 +03:00
Matt Mackall
f3552e4141 config: allow spaces in key portion of items 2009-04-29 20:47:30 -05:00
Matt Mackall
f4f1e74f08 localrepo: use set for requirements 2009-04-29 20:47:28 -05:00
Matt Mackall
2beed3c7cc dirstate: use propertycache 2009-04-29 20:47:18 -05:00
Matt Mackall
a2f3734c4c localrepo: use propertycache 2009-04-29 20:47:15 -05:00
Steve Borho
52bf113f2e ui: replace regexp pattern with sequence of choices
Use ampersands (&) to delineate the response char in each choice.
ui.prompt() responses are now explicitly case insensitive.  GUIs
that subclass ui can generate dialogs from the full choice names.
2009-04-30 10:15:32 -05:00
Matt Mackall
ee9ffff851 Merge with crew-stable 2009-04-26 16:49:47 -05:00
Patrick Mezard
ccca7abe8e convert/bzr: make it work with filemaps (issue1631)
The bzr converter maintains a child -> parents mapping and drop entries
whenever a child is read. It does not work with filemaps, getchangedfiles() may
be called more than once when filtered files belong to merge revisions.
getchanges() still works that way but it is not clear whether a similar issue
can arise when interacting with merges.
2009-04-26 11:35:53 +02:00