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
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
Matt Mackall
68f6893175
Merge with -stable
2009-03-20 18:55:20 -05: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
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
Greg Ward
c9426abe07
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
2009-03-18 09:15:38 -04: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
Matt Mackall
56a3a8557f
Merge with crew-stable
2009-03-09 11:41:38 -05:00
Benoit Boissinot
c34938cba1
verify: find correct first corrupted cset for missing/corrupted revlogs
2009-03-07 20:16:03 +01:00
Benoit Boissinot
5ed5555a2d
verify: do not abort on fully corrupted revlog
2009-03-07 20:04:56 +01:00
Benoit Boissinot
35d90d90ba
hgweb: fix allow_read permissions when a user is specified
...
Thanks to Juan Pablo Aroztegi for reporting and debugging it.
2009-03-07 00:59:41 +01:00
Mads Kiilerich
240dc61d24
test-identify: require no-outer-repo
...
The test expects "There is no Mercurial repository here (.hg not found)"
2009-03-05 14:53:59 +01:00
Alexander Solovyov
ebb0c7d950
zeroconf: advertise repositories with hostname
2009-03-05 12:58:13 +02:00
Matt Mackall
8568435f75
Merge with crew
2009-03-16 17:56:50 -05:00
Martin Geisler
84d0a9dc82
i18n: better Danish word for "working directory"
2009-03-10 23:41:37 +01:00
Martin Geisler
c5e7ecd60b
i18n: add Danish translation for "commit"
2009-03-10 23:32:40 +01:00
Martin Geisler
9125dd2b2f
i18n: translated help for all basic commands into Danish
2009-03-10 23:32:13 +01:00
Martin Geisler
5e59608707
i18n: updated fuzzy Danish translations
2009-03-10 23:31:18 +01:00
Martin Geisler
0abf6da7cf
i18n: merged new strings into Danish translation
2009-03-10 23:30:51 +01:00
FUJIWARA Katsunori
93e804e677
i18n: update Japanese translation to follow 51c0cedf252f
2009-03-07 23:36:22 +09:00
Benoit Boissinot
1651c346c7
merge with -stable
2009-03-07 20:30:20 +01:00
Brendan Cully
8ecc8f3e92
Merge with main
2009-03-06 12:35:48 -08:00
Benoit Allard
bf86b21b09
update copyright date in version information
2009-03-05 10:38:39 +01:00
Dongsheng Song
3cab4b874a
Typo fix
2009-03-05 14:44:13 +08:00
Steve Borho
270940d51c
update copyright in ReadMe.html
2009-03-04 22:56:17 -06:00