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
Marti Raudsepp
387a098ed6
convert: Add testcase for convert authormap.
2009-03-14 14:31:08 +02:00
Alexander Solovyov
86b994e311
extensions loading: don't fail if path to extension ends with a '/'
2009-04-01 12:11:14 +03:00
Christian Ebert
3849a2cc57
tests: guess lexer by filename for recent pygments
...
Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii
by util.tolocal, which yields class="err". Guess lexer by extension instead.
2009-04-04 15:14:36 +02:00
Jeremy Whitlock
94b6b92b9f
Fix how setup.py identifies the Mercurial version.
...
There is a problem with setup.py where it will not identify the Mercurial
version properly when not being ran in within a repository even if
mercurial/__version__.py exists.
To fix, use mercurial.__version__.version when available before defaulting
to "unknown". (Using mercurial.util.version() is not an option due to a
dependency issue where osutil can be referenced before it is built.)
2009-04-02 18:18:43 -06:00
Pavel Volkovitskiy
d933c50ed4
right way to check if file was in renamed directory, fixes import monotone
...
repos with renamed directories
2009-04-02 22:25:49 +04:00
Henrik Stuart
ced279d296
convert: added cvsnt mergepoint support
2009-04-02 14:48:06 +02:00
Stefano Tortarolo
73c9e38e37
rebase: keep original mq patch format (Issue1574)
...
Rebase now doesn't make assumptions about which format has been
used for a mq patch (git or normal).
Before finalizing a patch it keeps track of the original format,
by reading its header, and then restores the format when reimporting
it.
This way it also allows for having mixed styles.
Note: this version corrects a failure in the test
2009-03-26 16:58:50 +02:00
Stefano Tortarolo
3d01e07230
rebase: don't lose rename/copy data (Issue1423)
2009-03-30 18:26:32 +02:00
Justin Peng
d4938a90ee
Correct a bug on date formats with '>' or '<' accompanied by space characters.
2009-04-01 09:11:00 -07:00
Stefano Tortarolo
6016fce500
rebase: store/restore arguments correctly
...
Keep and keepbranches were lost after an interruption
2009-03-29 14:43:49 +02:00
Stefano Tortarolo
f885e061f2
rebase: correct help text
...
Show the correct parameters in help text
2009-03-29 14:47:59 +02:00
Greg Ward
4d99354f37
issue1578: fix crash: do not use synthetic changesets as merge parents.
2009-03-28 12:27:20 -04:00
Matt Mackall
d60aaf81dc
windows: get Abort from error
2009-04-03 14:52:03 -05:00
Matt Mackall
642f4d7151
move encoding bits from util to encoding
...
In addition to cleaning up util, this gets rid of some circular dependencies.
2009-04-03 14:51:48 -05:00
Matt Mackall
2cddde0437
move util.Abort to error.py
2009-04-03 13:20:52 -05:00
Matt Mackall
9c307b1dee
setup: remove spurious posix import
2009-04-03 12:37:44 -05:00
Matt Mackall
019a0b138e
pure/parsers: fix circular imports, import mercurial modules properly
2009-04-03 12:37:38 -05:00
Matt Mackall
c36ce7ba2b
pure/bdiff: fix circular import
2009-04-03 12:37:30 -05:00
Matt Mackall
bcbc752a6f
posix: kill some trailing newlines
2009-04-03 12:37:07 -05:00
Matt Mackall
579fb2ffc2
mention default branch in branch and clone help
2009-04-03 12:37:06 -05:00
Stefano Tortarolo
66da1b8bd5
i18n: update italian translation
2009-03-10 19:16:16 +01:00
Fabian Kreutz
3cdc0b147d
i18n-de: Commands (push and pull) + typos
2009-04-02 10:30:00 +03:00
Tobias Bell
e924b4f339
i18n-de: translated global options of commands
2009-04-02 08:15:39 +02:00
Tobias Bell
9b52532b3f
i18n-de: removed fuzzy translations after update of POT file
2009-04-01 21:06:12 +02:00
Tobias Bell
027ca99b6f
i18n-de: translated ui.py, url.py and util.py
2009-03-29 19:57:28 +02:00
Tobias Bell
e975aa03ac
i18n-de: translated 'help multirevs'
2009-03-29 19:03:09 +02:00
Steve Borho
63d4e6092c
on clone failure, only remove directories we created
...
If the user created the clone target directory before running
the clone command, only cleanup the .hg/ repository when errors
occur. Leave the empty target directory in place.
2009-03-31 21:21:53 -05:00
Martin Geisler
df38a73894
windows: break import cycle with util
2009-04-02 18:04:42 +02:00
Sune Foldager
a909400362
windows: fix missing import of util.Abort
2009-04-02 17:09:17 +02:00
Sune Foldager
9aaf69227a
windows: fix import of win32.py (was util_win32.py)
2009-04-02 16:49:34 +02:00
Greg Ward
558dacc406
issue1582: improve description of splicemap syntax in help.
2009-03-31 15:52:48 -04:00
Martin Geisler
541fd005f1
merge with -stable
2009-03-31 23:11:11 +02:00
Martin Geisler
b5e430c97b
hgweb: better English in IPv6 error message
2009-03-31 22:48:16 +02:00
Steve Borho
ad54f46fa2
allow clone into existing but empty directories
2009-03-29 16:15:06 -05:00
Wagner Bruna
b2fafee0f4
verify, i18n: fix unmarked strings
2009-03-29 19:56:53 -03:00
Martin Geisler
732e483231
i18n: updated zh_CN instructions
2009-03-31 20:40:56 +02:00
Martin Geisler
4340d08e33
i18n: rename zh.po to zh_CN.po
...
This is the name used by at least Debian and RedHat for the Simplified
Chinese translations.
Furthermore, it is my understanding that a Simplified Chinese
translation is a poor fallback for users in Taiwan, who need a
Traditional Chinese translation instead.
2009-03-31 20:30:20 +02:00
Martin Geisler
2d9bab6890
httprepo: lowercase debug output
2009-03-29 21:52:43 +02:00
Benoit Boissinot
868a1f07ed
merge with -stable
2009-03-30 01:30:58 +02:00