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
Dongsheng Song
da72eadd2c
Clarify the usage of HGRCPATH
2009-03-07 16:06:46 +08: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
Matt Mackall
81073ba20c
setup.py: fix version detection for tarball
...
- don't do version detection if there's no .hg directory
- shrink try: clause
- don't write __version__.py if version is unknown
(we might overwrite the real version)
2009-03-06 09:15:47 -06:00
Matt Mackall
afd0e02098
Added signature for changeset 66a06202b565
2009-03-04 19:04:21 -06:00
Mads Kiilerich
e39fe5275e
Optimization of pure.base85.b85encode
...
This makes pure python base85 encoding 3x faster than before. Now it is only
40x slower than the C version.
2009-03-04 23:23:59 +01:00
Frank Kingswood
a2f1d401c2
convert: Perforce source for conversion to Mercurial
2009-03-03 21:32:23 +00:00
Matt Mackall
f91e781c87
remove tests for long-gone imerge extension
2009-03-04 18:42:24 -06:00
Augie Fackler
bf90b0cbb4
merge: better error messages to lead users to hg update --clean to abandon merges.
...
Fixes issue1533.
2009-03-04 13:06:16 -06:00
Matt Mackall
5871cdf2c8
audit: be even pickier (issue1450)
2009-03-04 17:02:16 -06: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
Bill Barry
8ac447bbd7
dispatch: extract command execution block into method
...
This pulls the pre-command hook/command/post-command hook workflow out of
the method it is in and puts it into its own method so that it potentially
could be exposed for extensions to wrap.
2009-02-12 09:36:15 -07:00
Benoit Allard
8cea013db9
bookmarks: change NAME to REV
2009-02-05 23:47:31 +01:00
Alex Unden
eb753f04dc
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
2009-02-27 02:01:45 -08:00
David Soria Parra
f6ec2e9b01
bookmarks: Set current bookmark if we create a new one on the tip
...
If track.current is enabled we set the newly created bookmark as the
current tracked bookmark. We do not do this if a revision is specified.
2009-03-01 00:30:01 +01:00
Matt Mackall
6ed04dc163
convert: change hg.saverev default to False
...
This needlessly breaks changeset identifiers for the common case (cleaning
history), which is sad.
2009-03-02 19:19:12 -06:00
Matt Mackall
104cda5c20
tag: force load of tag cache
2009-03-02 19:19:09 -06:00
Mads Kiilerich
2694fdc1a4
run-tests.py: avoid using popen2.Popen4 - use subprocess instead
...
Use subprocess to emulate Popen4 if available - similar to how it is done in
util.py.
Using popen2 under python 2.6 gives
DeprecationWarning: The popen2 module is deprecated. Use the subprocess module.
2009-02-27 19:10:38 +01:00
Mads Kiilerich
9686279212
test-convert-cvs*: mute output from "cvs up"
...
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
2009-02-27 17:52:31 +01:00
Stefano Tortarolo
b64c9c29db
i18n: update italian translation
2009-02-28 13:15:58 +01:00
Dirkjan Ochtman
fee33f3cb4
merge with crew-stable
2009-03-02 23:11:15 +01:00
Stefan Rusek
50d1fd501f
include i18n files in the win32 installer
...
The .mo files for translations should be included in the Windows installer.
2009-03-02 23:07:56 +01:00
Dirkjan Ochtman
f7eaf63265
help: get rid of double spaces
2009-02-28 12:33:24 +01:00
timeless
26d95caa99
help: miscellaneous language fixes
2009-02-28 12:38:45 +01:00
