Benoit Boissinot
c8ed050aba
prepush: add more precise error messages
...
Part of the patch is from timeless@mozdev.org
- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
between discovery and the call to branchmap(). In that case, asking the user
to merge isn't helpful, since only remote has the changes.
2010-02-08 19:44:04 +01:00
Benoit Boissinot
a2e24d1e23
revlog: don't silently discard revlog flags on revlogv0
2010-02-08 17:28:19 +01:00
Benoit Boissinot
328394047f
fix coding style (reported by pylint)
2010-02-08 15:36:34 +01:00
Benoit Boissinot
9ab1f0678a
add pylintrc with some mercurial specific configuration
2010-02-08 15:06:26 +01:00
Benoit Boissinot
fc2478db7d
localrepo: cleanup branch tip computation
2010-02-08 14:52:28 +01:00
Steve Borho
4bb4d09720
hgrc.5: Fix a typo
2010-02-08 06:24:34 -06:00
Matt Mackall
70833ec6ad
summary: various fixes, add a test
...
fix breakage from recent parseurl changes
fix reporting of resolved
fix reporting of update in certain cases
2010-02-08 11:04:38 +01:00
Sune Foldager
0d082ae358
fix remaining hg.parseurl uses
2010-02-08 10:32:44 +01:00
Steve Borho
9a5cb3aaab
win32: allow hgrc.d on Windows
2010-02-07 05:34:22 -06:00
Brendan Cully
5551943cd9
zeroconf: use DNS length field to safely skip unknown record types
2010-02-08 00:01:08 +01:00
Brendan Cully
d5437ba5b0
zeroconf: better fix for readName error
...
Stop parsing when an unknown type is seen, since it is impossible
to resynchronize on the stream.
2010-02-07 19:39:29 +01:00
Brendan Cully
182305d033
zeroconf: try utf-16 decoding if utf-8 fails
2010-02-07 18:37:14 +01:00
Brendan Cully
ce047e9ab3
import: import each patch in a file or stream as a separate change
...
Supports hg export <revrange>, mail messages, and mailboxes.
Does not support multiple patches in a single MIME attachment.
Closes issue167.
2010-02-07 18:06:52 +01:00
Dirkjan Ochtman
09ba0e50af
ui: look before you leap on sys.stdout.closed
2010-02-07 16:44:55 +01:00
Augie Fackler
2df305a808
mq: fix deprecation mention, line length
2010-02-07 16:03:38 +01:00
Dirkjan Ochtman
19a2ad102b
merge with mpm
2010-02-07 16:04:42 +01:00
Sune Foldager
9fef9be505
addbranchrevs: fallback for older servers
2010-02-07 15:57:16 +01:00
Sune Foldager
3f138e6345
add -b/--branch option to clone, bundle, incoming, outgoing, pull, push
2010-02-07 15:23:46 +01:00
Matt Mackall
b7afbe529a
streamclone: allow uncompressed clones by default
2010-02-07 15:31:53 +01:00
timeless
a4b2e4932b
help: Improved body text
2010-02-07 15:08:26 +01:00
Saint Germain
ca80dfaea9
subrepo: change default path in hgrc of subrepo after cloning
...
Previous behavior was to put in the cloned subrepos the path found in the original main repo.
However it isn't valid for relative path and it seems more logical to reference instead the subrepos
working copy path of the original main repo.
2010-02-06 19:14:37 +01:00
timeless@mozdev.org
4cd821593d
commands: Try to improve help options text for basic commands
...
Mostly rewrite -r text
2009-11-20 14:37:36 +02:00
Martin Geisler
4817fcfe96
check-code.py: make help strings consistent
2010-02-07 10:58:51 +01:00
Mads Kiilerich
289637cadf
check-code.py: escape backslash
2010-02-07 01:52:10 +01:00
Augie Fackler
03f43e09ea
qnew: ignore force option
...
This makes the default behavior the same as qnew --force, and
deprecates the force option.
2010-02-07 07:37:05 -06:00
Dirkjan Ochtman
a0b7a8db3f
strip apostrophes from an error messages
2010-02-07 15:09:02 +01:00
Dirkjan Ochtman
d5c4ebd0b0
mq: fix typo, thanks pmezard
2010-02-07 14:53:17 +01:00
Dirkjan Ochtman
0e0764f0be
commands: annotate follows by default, separate -f/--file option
2010-02-07 14:51:52 +01:00
Patrick Mezard
1ce5274987
Merge with crew-stable
2010-02-07 14:43:21 +01:00
Sune Foldager
5020620fca
interpret repo#name url syntax as branch instead of revision
...
Previously, the name part of an repo#name url was interpreted as a
revision, similar to using the --rev option. Now it is instead looked
up as a branch first, and if that succeeds all the heads of the branch
will be processed instead of just its tip-most head. If the branch
lookup fails, it will be assumed to be an revision as before (e.g. for
tags).
2010-02-07 14:29:07 +01:00
Brodie Rao
91c6eab10f
dispatch: provide help for disabled extensions and commands
...
Before a command is declared unknown, each extension in hgext is searched,
starting with hgext.<cmdname>. If there's a matching command, a help message
suggests the appropriate extension and how to enable it.
Every extension could potentially be imported, but for cases like rebase,
relink, etc. only one extension is imported.
For the case of "hg help disabledext", if the extension is in hgext, the
extension description is read and a similar help suggestion is printed.
No extension import occurs.
2010-02-07 14:01:43 +01:00
Patrick Mezard
9d2e0b1006
test-mq-qrefresh: test qrefresh when tip != qtip
2010-02-07 11:38:36 +01:00
Brodie Rao
b0f0c580fa
extensions: refactor disabled()
2010-02-07 11:32:08 +01:00
Dirkjan Ochtman
e11a173bf9
mq: don't warn on qpush against a branch head
2010-02-07 14:06:05 +01:00
Dirkjan Ochtman
38666f1574
mq: deprecate qinit and qcommit
2010-02-07 13:49:52 +01:00
Dirkjan Ochtman
7144a20940
mq: deprecate qsave, qrestore and related options
2010-02-07 12:34:02 +01:00
Dan Villiom Podlaski Christiansen
7bb072742b
mq: remove qrefresh slow path (issue2025)
...
The slow path/fast path distinction has existed since mq was added to Mercurial
in 2006. The slow path was used whenever the refreshed revision wasn't the tip
2010-02-06 18:36:27 +01:00
Augie Fackler
eb981049ec
zeroconf: gethostbyaddr may also fail with socket.herror
2010-02-05 10:16:52 -06:00
Steve Borho
9f38cd0e08
commands: label from user is in local encoding
...
repo.branchtags().keys() are in UTF-8, so the label should be converted to UTF-8
before checking for a naming conflict. Keep the original label for ui.status()
2010-02-05 04:33:08 -06:00
Matt Mackall
6aa6700c5e
Added signature for changeset 98def3dab26e
2010-02-01 09:34:35 -06:00
Matt Mackall
348c8e2e38
Merge with i18n
2010-02-01 09:18:25 -06:00
Wagner Bruna
9423dbe3ae
i18n-pt_BR: synchronized with 8e4990c92d28
2010-02-01 11:10:43 -02:00
Matt Mackall
06bae668d4
copies: revert 1f784cae6615
...
The behavior of rebase both before and after the fix was actually
incorrect, and this change regressed other parts of copy behavior.
2010-01-31 12:19:52 -06:00
Georg Brandl
e7a6b974ac
i18n: fix typo in German translation
2010-01-30 19:49:52 +01:00
Matt Mackall
6bd5cfceca
config: handle short continuations (issue1999)
...
Thanks to Greg Ward for spotting and testing
2010-01-28 23:07:28 -06:00
Matt Mackall
1f628d9563
copies: fix issue1994
...
Unscramble divergence test
2010-01-28 22:45:46 -06:00
Christian Ebert
a215bd3d0b
patchbomb: document [patchbomb] config section for addresses
2010-01-28 11:27:09 +00:00
Christian Ebert
42dde8faf8
hgrc.5: whether bcc is prompted for is up to the extension
...
There is no code in mail.py that forbids an extension to prompt for bcc.
2010-01-28 10:38:29 +00:00
Mads Kiilerich
6240e17232
test-encode: Use tr chacter classes instead of character ranges
...
Solaris ...
2010-01-23 02:03:42 +01:00
Martin Geisler
18f51e69c3
templates: do not add "ago" twice
...
After 8c278d482e5a, "ago" is added by the ago template filter.
2010-01-23 16:54:53 +01:00
