Martin Geisler
af7a5be45e
commands, help: consistently write 'URL' in upper-case
2009-04-04 17:44:18 +02:00
Martin Geisler
12c9385a4d
help: expand command names in 'Url Paths' help text
2009-04-04 17:41:22 +02:00
Martin Geisler
bb347e5a7f
commands: better merge help text
2009-04-04 17:33:42 +02:00
Martin Geisler
fee1365c04
commands: removed redundant text in manifest help
2009-04-04 16:46:50 +02:00
Martin Geisler
0512095ede
commands: stress that commit is a local operation
2009-04-04 00:32:06 +02:00
Martin Geisler
695e12c72b
commands: use single-quotes for 'hg help ...' hints
2009-04-04 00:27:55 +02:00
Matt Mackall
f2b63f05d7
convert: attempt to check repo type before checking for tool
2009-04-04 12:28:13 -05:00
Dirkjan Ochtman
049b5daa9b
merge with crew-stable
2009-04-04 19:43:00 +02:00
Rocco Rutte
4e357910ab
convert: simple fix for non-existent synthetic/mergepoint attributes
2009-04-04 18:08:41 +02:00
Marti Raudsepp
b717070e88
convert: handle comments starting with '#' in authormap files
2009-04-04 18:04:38 +02:00
Dirkjan Ochtman
7856ee8225
cmdutil: refactor handling of templating in show_changeset()
2009-04-04 17:55:52 +02:00
Dirkjan Ochtman
0b1a57839b
templater: move stylemap function from hgweb to templater
2009-04-04 17:46:11 +02:00
Tobias Bell
5548c767cc
i18n-de: translated record
2009-04-04 10:51:52 +02:00
Tobias Bell
43090936c2
i18n-de: translated archival.py, bundlerepo.py, changegroup.py and changelog.py
2009-04-03 22:35:07 +02:00
Fabian Kreutz
87791dba2d
i18n-de: docu for resolve
2009-04-03 11:57:05 +03:00
Marti Raudsepp
f86045b534
convert: fix authormap handling of lines without '='
...
Unpacking the result from str.split raises ValueError, not IndexError, if the
line does not contain a '='.
2009-04-04 15:41:32 +02:00
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
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
