Benoit Boissinot
fe6c4f18cd
Backed out changeset d4343088804c
...
The difference came from a configuration difference (network unreachable vs.
connection refused), not from an OS change.
2009-03-30 01:23:01 +02:00
John Coomes
664dabc0ed
tests: strip o/s-dependent error messages from some http tests
2009-02-27 17:28:26 -08:00
Benoit Boissinot
6469b223b7
bisect: use integer division
2009-03-28 17:29:14 +01:00
Martin Geisler
05b3dfb2cf
cmdutil: fix untranslatable string in copy
2009-03-27 17:35:00 +01:00
Tobias Bell
afe3a2b645
enhance Makefile for language translators
...
To update a po-file just do 'make i18n/xx.po'. No other po-file will
be touched.
2009-03-26 08:07:28 +01:00
Nicolas Dumazet
ddda9ba6fe
Fixing issue1542, adding a relevant test
...
inotify is smart enough to notify you about any changes in a
directory, even if you only watch the directory, and none if its
contents: the recursive add_watch I added was unnecessary.
The only thing that matters here is the recursive status update on
directory deletion.
And scan() has to be called _before_ the deferred call is registered.
(race condition: depending on the times, the previous patch could
apparently fail on the provided test. It's not the case anymore.)
2009-03-26 19:01:06 +09:00
Stefano Tortarolo
bf2fa160b0
rebase: remove unused statement
2009-03-11 20:28:09 +01:00
Matt Mackall
0952760f82
util: split out posix, windows, and win32 modules
2009-03-26 13:54:44 -05:00
John Mulligan
18339d9ef9
patchbomb: option to set the name of bundle attachment (issue1452)
...
specifying --bundlename=NAME will create a "NAME.hg" attachment
2009-03-14 10:46:48 -04:00
Matt Mackall
b6fd334dd0
Merge with -stable
2009-03-24 16:41:41 -05:00
Greg Ward
e688a18c6f
Typo fix in help.
2009-03-23 15:04:26 -04:00
madhu@madhu
d6166450e5
Returns lines changed for paths specified as arguments correctly.
...
This fixes issue 1569. hg churn <path> now returns only the number
of lines changed in the path, if the path is specified by filtering
files through a match filter at the changeset level. test-churn
has been updated to take care of this issue.
2009-03-25 01:49:03 +05:30
Dirkjan Ochtman
fe39d83f68
cleanup: remove all trailing whitespace
2009-03-23 13:11:11 +01:00
Peter Arrenbrecht
b1f5d67640
keepalive: fix reference to IncompleteRead
2009-03-23 11:12:01 +01:00
Pascal Quantin
79f2ac527a
merge tools: fix typo in Beyond Compare's 3 command line
...
Fix a typo error preventing 'base' to be displayed properly.
2009-03-23 10:48:45 +01:00
Tobias Bell
d744971252
i18n: add German translation
...
* Most basic commands are translated
* hgext/alias.py
* hgext/acl.py
* hgext/fetch.py
* help topics
* urls
* dates
* patterns
* diffs
433 translated messages, 1350 untranslated messages.
Translators:
* Tobias Bell
* Fabian Kreutz (fabian DOT kreutz AT qvantel.com)
* Lutz Horn (lutz DOT horn AT fastmail DOT fm)
Please report issues to http://bitbucket.org/tobidope/i18n-german-translation/issues/
or to the mailing list.
2009-03-22 20:59:03 +01:00
Matt Mackall
1fca17b321
Fix new CVS test output
2009-03-20 18:49:44 -05:00
Matt Mackall
4ccf2f5c68
Added signature for changeset e2c1048c9faf
2009-03-20 17:58:11 -05:00
Dongsheng Song
faee65720b
i18n: updated Chinese translation
2009-03-20 14:28:48 +08:00
Greg Ward
c9426abe07
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
2009-03-18 09:15:38 -04:00
Stefano Tortarolo
f95f7599c7
i18n: update italian translation
2009-03-10 19:16:16 +01:00
Nicolas Dumazet
3ced073c3b
revlog: faster hash computation when one of the parent node is null
...
Because we often compute sha1(nullid), it's interesting to copy a precomputed
hash of nullid instead of computing everytime the same hash. Similarly, when
one of the parents is null, we can avoid a < comparison (sort).
Overall, this change adds a string equality comparison on each hash() call,
but when p2 is null, we drop one string < comparison, and copy a hash instead
of computing it. Since it is common to have revisions with only one parent,
this change makes hash() 25% faster when cloning a big repository.
2009-03-23 15:32:29 +01:00
Nicolas Dumazet
5c8c0a663b
ancestor: caching the parent list to improve performance
...
When computing the DAG depth, we walk through all ancestors: this commit adds
memoization during that first step. Then, the memorized parents are fetched
from a dict instead of calling parents() on each vertex.
This tweak, according to Kcachegrind, improves ancestor() performance by 16%
when cloning a big repository.
2009-03-23 15:36:30 +01:00
Dirkjan Ochtman
7b5b0945c3
kill another trailing space
2009-03-23 13:49:16 +01:00
Dirkjan Ochtman
33d6485beb
add debugcommands command: an easy to parse command + option index
2009-03-23 13:43:48 +01:00
Alexander Solovyov
475ce753d3
templater: ability to display diffstat for log-like commands
2009-03-23 10:41:42 +01:00
Alexander Solovyov
7ea3611901
templater: use contexts consistently throughout changeset_templater
2009-03-23 13:15:57 +01:00
Peter Arrenbrecht
8c3658a497
cleanup: whitespace cleanup
2009-03-23 13:13:27 +01:00
Peter Arrenbrecht
ce6e853a0b
cleanup: drop enumerate() when index is not used
2009-03-23 13:13:11 +01:00
Peter Arrenbrecht
19591b6a8c
cleanup: drop unused assignments
2009-03-23 13:13:06 +01:00
Peter Arrenbrecht
a2d3e23eef
cleanup: drop variables for unused return values
...
They are unnecessary. I did leave them in localrepo.py where there is
something like:
_junk = foo()
_junk = None
to free memory early. I don't know if just `foo()` will free the return
value as early.
2009-03-23 13:13:02 +01:00
Peter Arrenbrecht
bc21361ed2
cleanup: drop unused imports
2009-03-23 13:12:07 +01:00
Alexander Solovyov
0dac3f9036
contrib: add perflog and perftemplating commands to perf extension
2009-03-23 13:12:03 +01:00
Dirkjan Ochtman
66fabbd9b4
merge with crew-stable
2009-03-23 13:12:44 +01:00
Matt Mackall
68f6893175
Merge with -stable
2009-03-20 18:55:20 -05:00
Lee Cantey
1f2673b393
Fix for merge changes introduced in rev 397091458855
2009-03-19 10:25:13 -07:00
Dirkjan Ochtman
6160525885
merge with crew-stable
2009-03-18 17:49:48 +01:00
Dirkjan Ochtman
0027b7f5ed
convert: honor 2.3 compatibility (rsplit)
2009-03-18 17:49:11 +01:00
Matt Mackall
4cd17487f7
Merge with stable
2009-03-17 13:46:53 -05:00
Benjamin Pollack
022828a7a5
regression test for issue1552
...
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
2009-03-17 11:34:40 -04:00
Benjamin Pollack
206a106a49
fetch: do not count inactive branches when inferring a merge
...
The fetch extension would erroneously consider inactive branches when
inferring which branches to merge. It now considers only active
branches.
2009-03-17 11:47:40 -04:00
Matt Mackall
7d51e0b1f6
bundlerepo: reintroduce dirstate
2009-03-17 13:43:11 -05:00
Michael Springmann
10782daaf2
exporting patch:
...
Fixed behavior of revsplit for branch names including the @-symbol.
2009-03-13 21:14:57 +01:00
Steve Borho
1495d07855
demandimport: blacklist pythoncom
...
win32com.shell would segfault at import time if pythoncom
was demand loaded.
2009-03-09 21:00:37 -05:00
Matt Mackall
02f3d06343
diffstat: use width 80 by default and avoid division by zero
2009-03-20 14:38:50 -05:00
Augie Fackler
526bbde326
bisect: fix --command for me.
2009-03-09 17:13:12 -05:00
Matt Mackall
e31a8bb788
atom: fix URLs used in entry GUIDs
2009-03-16 17:21:06 -05:00
Matt Mackall
805511403b
resolve: move reset to localrepo.commit
...
This way rebase doesn't leave a stale resolve state
2009-03-16 16:58:41 -05:00
Matt Mackall
891ec3832e
resolve: keep .orig files
2009-03-16 16:58:41 -05:00
Mads Kiilerich
21fd26f154
test-merge-tools: test ui.merge functionality and selection of internal tools
2009-03-09 18:44:44 +01:00