Vsevolod Solovyov
201e56ffbb
Fix issue1495, corner case of adding empty files via patching
2009-03-24 23:28:55 +00:00
Matt Mackall
7e7ba71a3a
Merge with crew-stable
2009-04-03 11:50:42 -05:00
Simon Heimberg
5ebb56cc6d
error: import LockError from correct module
2009-03-31 07:56:28 +02:00
Brodie Rao
cb9a8632f9
hgweb: fix undefined name RepoError
2009-03-27 11:17:46 -04: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
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
Greg Ward
c9426abe07
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
2009-03-18 09:15:38 -04: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
Dirkjan Ochtman
0027b7f5ed
convert: honor 2.3 compatibility (rsplit)
2009-03-18 17:49:11 +01: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
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
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
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
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
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
