Commit Graph

2454 Commits

Author SHA1 Message Date
David Soria Parra
5b87f2b170 bookmarks: Use error message consistently
The 'updating bookmark %s failed!' message is better than
'failed to update bookmark %s'. To have more consistent error
messages we use just 'updating bookmarks %s failed'.
2010-06-23 11:53:59 +02:00
David Soria Parra
62a88dc827 bookmarks: Add -B option to incoming/outgoing to compare bookmarks
We add a -B/--bookmarks option to hg incmoing and hg outgoing. If the option
is passed we compare bookmarks instead of changesets. This can be used
to see which bookmarks do not exists on the remote site.
2010-06-20 12:26:48 +02:00
Martin Geisler
f455cb5a95 Merge with mpm 2010-06-20 23:37:09 +02:00
Martin Geisler
f08fb80ec0 acl: delete trailing whitespace in docstring 2010-06-20 19:48:28 +02:00
Yuya Nishihara
968bdb2fd0 pager: respect HGPLAIN
Pager shouldn't be enabled for scripting use.
2010-06-20 01:20:12 +09:00
Christian Ebert
60b4f2db95 patchbomb: reduce number of opts.get calls
Rename outgoing() function to getoutgoing() analogous to
getbundle() etc. to avoid name conflict.
2010-06-16 00:37:21 +02:00
Georg Brandl
9033acc5dc transplant: when reading journal, treat only lines starting with "# " special like patch.extract() does 2010-06-19 12:51:57 +02:00
Matt Mackall
0b177f47ca bookmarks: add support for push --bookmark to export bookmarks 2010-06-17 15:54:26 -05:00
Matt Mackall
624998f1b4 bookmarks: add support for pull --bookmark to import remote bookmarks 2010-06-17 14:26:23 -05:00
Dirkjan Ochtman
75e5a3fcef mq: __str__ falls back to __repr__ 2010-06-17 15:53:26 +02:00
Matt Mackall
bb9bb2f2c0 bookmarks: update known bookmarks on the target on push 2010-06-17 12:22:21 -05:00
Matt Mackall
58c8d93978 bookmarks: pull known bookmarks from server that are newer 2010-06-17 12:10:47 -05:00
Matt Mackall
07bf3725e6 bookmarks: add pushkey server-side support 2010-06-17 11:01:51 -05:00
Greg Ward
1b6a40bfe8 mq: make 'qdelete <patchidx>' work again.
This just backs out b51fc1a46a02 (a minor code cleanup that
accidentally broke qdelete) and adds a test.
2010-06-16 22:00:02 -04:00
Martin Geisler
0cbec6eadd relink: ensure deterministic directory walk in collect 2010-06-16 12:22:14 +02:00
timeless
675858ac70 relink/progress: Adding progress for collecting stage 2010-06-10 15:35:06 +02:00
timeless
6ffa07b04b relink/progress: Adding progress for pruning stage 2010-06-10 13:09:50 +02:00
Christian Ebert
e5d231e804 keyword: postpone manifest calculation in kwtemplater.overwrite
We can check for file existence in the working directory (needed
in case of recording) by simply using the given context and
calculate the manifest only when there are in fact candidates
for expansion/shrinking.
2010-06-15 17:15:31 +02:00
Martin Geisler
6e246c45aa p4: fix long line and bad spacing around % 2010-06-15 11:05:17 +02:00
Frank Kingswood
28f1de6e41 Fix shell quoting on p4 conversion 2010-06-14 16:38:36 +01:00
Renato Cunha
b35e385443 hgext/zeroconf/__init__.py: Separate relative and absolute imports.
2to3 complains when relative and absolute imports are mixed, this fix just
separates them on the zeroconf extension. According to 2to3, the other modules
are fine.
2010-06-14 16:56:20 -03:00
Dan Villiom Podlaski Christiansen
e64c6d6314 pager: set ui.formatted() prior to redirecting stdout. 2010-06-07 15:34:48 +02:00
Dan Villiom Podlaski Christiansen
de6e2d6afa mq: use ui.formatted() instead of ui.plain(). 2010-06-07 15:33:03 +02:00
Dan Villiom Podlaski Christiansen
eb569c8b47 color: use ui.formatted(). 2010-06-07 15:28:54 +02:00
FUJIWARA Katsunori
ce06b102df help: show value requirement and multiple occurrence of options
this helps users to know what kind of option is:

  - no value is required(flag option)
  - value is required
  - value is required, and multiple occurrences are allowed

each kinds are shown as below:

 -f --force              force push
 -e --ssh CMD            specify ssh command to use
 -b --branch BRANCH [+]  a specific branch you would like to push

if one or more 3rd type options are shown, explanation for '[+]' mark
is also shown as footnote.
2010-06-06 17:25:00 +09:00
Christian Ebert
6241cdaae9 keyword: pass context to kwtemplater.overwrite
Now that we have retrieved the context in every calling function
except commit, pass it as argument to kwtemplater.overwrite to
avoid looking it up twice.

Reorder arguments to kwtemplater.overwrite to reflect their
importance.

Turn node argument into a simple boolean and rename it to iswctx.
2010-06-09 12:45:48 +01:00
Stefano Tortarolo
28423089a9 rebase: --abort doesn't strip away the target changeset (issue2220)
When a changeset is skipped, rebase keeps the previous target as next
target and if the skipped cset is the first one, the recorded target is
actually the original target.
--abort did not detect this situation but simply stripped away the cset.
2010-06-08 18:01:07 +02:00
Steve Borho
0d0e614fc9 Merge backout 2010-06-08 15:52:56 -05:00
Steve Borho
b82bd4f289 Backed out changeset: 1bfde817782c 2010-06-08 15:52:41 -05:00
Martin Geisler
bd1de7cf0d mq: use hg reST role some more 2010-06-08 14:12:46 +02:00
Dirkjan Ochtman
af6b696f0f move working dir/dirstate methods from localrepo to workingctx 2010-06-07 20:03:32 +02:00
Steve Borho
e91613380a color: labeled text should be passed to ui.write() as ui.labeled
Some implementations of ui.label() (HTML versions in particular) must escape
the provided text and then markup the text with their tags.  When this marked
up text is then passed to ui.write(), we must label the text as 'ui.labeled'
so the implementation knows not to escape it a second time (exposing the initial
markup).

This required the addition of a 'ui.plain' label for text that is purposefully
not marked up.

I was a little pedantic here, passing even ' ' strings to ui.label() when it
would be included with other labeled text in a ui.write() call.   But it seemed
appropriate to lean to the side of caution.
2010-06-03 23:18:18 -05:00
Dirkjan Ochtman
cf1de649bd move discovery methods from localrepo into new discovery module 2010-06-07 18:35:54 +02:00
Christian Ebert
9f4630cb27 keyword: use context to detect uncommitted merge 2010-06-03 10:37:31 +01:00
Matt Mackall
ae637a04b0 rebase: use usual util.abort rather than error.ParseError 2010-06-04 17:22:33 -05:00
Matt Mackall
86ebd43d71 remoteui: move from cmdutil to hg 2010-06-01 11:18:57 -05:00
Cédric Duval
06eedc4b82 mq: prevent the creation of a queue whose name is already taken
Each check is moved under the code handling the relevant option, and
a new one is added for --create. This fixes duplicated entries being
added to the queues list.
2010-06-03 20:40:23 +02:00
Henrik Stuart
ac61fc4db1 mq: fix naming issues for qqueue directories 2010-06-02 19:39:45 +02:00
Martin Geisler
ae18c6a910 win32text: mark this extension as deprecated 2010-06-02 14:54:25 +02:00
Alexander Solovyov
a6931a2129 churn: add possibility to include/exclude paths 2010-05-27 22:50:23 +03:00
Alexander Solovyov
06239f590d churn: support spaces in aliases (issue2222) 2010-06-02 14:28:45 +02:00
Christian Ebert
8386b76841 keyword: retrieve added and modified files from commitctx 2010-06-01 03:45:10 +02:00
Christian Ebert
a2b0bda630 keyword: force dirstate normal when all changes in a file are recorded
Before this bugfix a file whose changes were entirely recorded was still
considered modified by "hg status".

Note: the test must use hg record -l/--logfile, because this is not
reproducible with hg record -m/--message.
2010-06-01 01:05:45 +02:00
Martin Geisler
e68f4fb8bb Merge with stable 2010-05-31 21:43:03 +02:00
Martin Geisler
d9fb8f71e1 eol: extension for managing file EOLs 2010-05-31 21:37:01 +02:00
Martin Geisler
9050bae24d Merge with stable 2010-05-31 13:55:47 +02:00
Nicolas Dumazet
20bba72bdf record: check that we are not committing a merge before patch selection
It might sound like a good idea to use record to filter changes when merging.
If someone attemps this, it's better to tell her "no" right ahead, before the
patch generation/line selection, so she does not spend time doing it just to
receive a red light after that (sometimes rather long) process.
2010-05-31 17:13:15 +09:00
Martin Geisler
575c7bca7d record: better way to find help in docstring
This outputs only the lines in the verbatim block without relying on
the translator to have translated the little 'y - record this change'
string.
2010-05-31 13:43:03 +02:00
Nicolas Dumazet
7a4893d709 record: docstring typo 2010-05-31 14:48:26 +09:00
Martin Geisler
4644ff1a96 mq: mention qqueue in module docstring 2010-05-30 23:24:10 +02:00