Commit Graph

14586 Commits

Author SHA1 Message Date
Augie Fackler
a3d0340408 update: check wc.dirty() before setting overwrite=True
merge.update() was missing a few dirtiness checks from workingcontext,
including subrepo cleanliness checks. Using wc.dirty() instead of
one-off checks for various forms of dirtiness will be significantly
safer.
2011-06-17 15:21:02 -05:00
Steve Borho
b9bfb1f58d tags: don't allow environment errors to be raised from _writetagscache
See https://bitbucket.org/tortoisehg/thg/issue/719
2011-06-16 15:26:17 -05:00
Wagner Bruna
c100667e38 help/config: replace docutils markup 2011-06-17 13:31:23 -03:00
Wagner Bruna
5a0aba06bc test-i18n, i18n-pt_BR: update test message
This changes both a test and a translation, so I'm sending
a patch; please let me know if I should push this directly
to i18n instead.
2011-06-17 12:23:12 -03:00
Matt Mackall
eb5cc8dd93 config: undo change of empty line definition
We don't allow spaces in front of comment markers
2011-06-17 15:36:56 -05:00
Patrick Mezard
86e3700676 patch: make filestore store data in memory and fallback to fs 2011-06-17 20:33:02 +02:00
Wagner Bruna
dc3642eb62 help/config: quote config section names consistently 2011-06-16 12:52:37 -03:00
Wagner Bruna
c203edb0e4 help/config: fix small typo 2011-06-16 12:42:19 -03:00
Wagner Bruna
eccfac28f2 help/config: do not refer to config files as hgrc files 2011-06-16 12:30:57 -03:00
Wagner Bruna
a463f7c11f help/config: fix 'Mercurial' casing 2011-06-16 12:30:44 -03:00
Thomas Arendsen Hein
282b06cd6f revset: add desc(string) to search in commit messages
Like keyword(), but does not search in filenames and users.
No grepdesc() or descgrep() added, because it might be bad to introduce
grepfoo() versions of too many string searches.
2011-06-16 22:47:34 +02:00
Thomas Arendsen Hein
f770eadd10 revset: update sorting of symbols 2011-06-16 22:03:26 +02:00
Matt Mackall
6e8d242aa0 http: fix variable name in unexpected response message 2011-06-16 14:33:06 -05:00
Idan Kamara
40027596a8 serve: add --cmdserver option to communicate with hg over a pipe 2011-06-03 17:27:41 +03:00
Idan Kamara
3910bf241e localrepo: don't attempt to open .hgtags twice if the error isn't ENOENT 2011-06-15 23:15:04 +03:00
Pierre-Yves David
d3dabeeb99 log: do not display hidden changeset
We add a --hidden option to display them.
2011-06-16 01:58:00 +02:00
Pierre-Yves David
2b4856c921 hidden: Add `hidden` method for context 2011-06-16 01:57:59 +02:00
Pierre-Yves David
7049209b6a hidden: Add a hiddenrevs attributes to changelog.
This attributes hold the set of all revisions that should be ommited by command
and tools displaying changesets.

This set is given as a hit. Command and tools are responsible to check it in
order to filter they outpur.

Code adding revisions to the set are responsible to the consistency of it's
data.
2011-06-16 01:57:53 +02:00
Matt Mackall
bf73994e3d config: handle comment lines in continuations (issue2854) 2011-06-16 13:24:44 -05:00
Matt Mackall
c96ac75208 http: report unexpected unparsable push responses (issue2777) 2011-06-16 13:24:42 -05:00
Idan Kamara
5e2d608efc dispatch: write shell alias output to ui out descriptor 2011-06-07 13:39:09 +03:00
Idan Kamara
71b4a06c3c commands: use ui descriptors when reading/writing from stdin/out 2011-06-08 14:54:52 +03:00
Idan Kamara
14ffa921d6 cmdutil: return a dummy, closable file object if it cannot be duped
If the ui I/O descriptors aren't real descriptors, they cannot be duped.

Instead, we return a wrapper object that behaves the same, and
can be closed (by overriding close and doing nothing).
2011-06-15 23:50:33 +03:00
Idan Kamara
936b803233 cmdutil: use ui descriptors in makefileobj 2011-06-08 14:54:52 +03:00
Idan Kamara
1a9dd17406 mq: use ui.fin when importing patch from '-' 2011-06-08 14:54:52 +03:00
Idan Kamara
4f72223e4d cmdutil, logmessage: use ui.fin when reading from '-' 2011-06-08 14:54:52 +03:00
Wagner Bruna
acc5952bf3 dagutil: fix missing import of i18n._ 2011-06-15 17:04:06 -03:00
Satish Balay
c27b39c4fa hgmanpage: adapt to Docutils 0.8 API change 2011-06-16 19:34:42 +02:00
Martin Geisler
213ba1f97d manifest: use "\0" instead of "\000"
Though both give the same result (a NUL byte), I found that I tend to
read "\000" as "\0" + "00", which is something completely different.

I did not change the occurance of "\000" in archival.py since there
are other octal constants in that file.
2011-06-16 08:49:26 +02:00
Martin Geisler
0e27878c46 commands: add pointer to bookmarks command in branch help 2011-06-15 17:25:58 +02:00
Martin Geisler
d70abc7125 glossary: add entry for "Bookmark" 2011-06-15 17:10:26 +02:00
Martin Geisler
790be68aef glossary: add entry for "Tag" 2011-06-15 17:10:16 +02:00
Matt Mackall
8a56d849ff merge with i18n 2011-06-14 20:43:04 -05:00
Peter Arrenbrecht
9a2d2f747c setdiscovery: batch heads and known(ownheads)
This means that we now discover both subset conditions (local<remote and
remote<local) in a single roundtrip without ever constructing an actual
sample (which takes a bit of client CPU).
2011-06-14 22:58:00 +02:00
Peter Arrenbrecht
32dcc012d5 wireproto: make a number of commands batchable
Makes lookup, heads, known, branchmap, pushkey, and listkeys batchable.
It could, for instance, be interesting to use this to batch calls to
lookup when a pull or clone has multiple --rev arguments. The next patch
is going to batch heads and known to slightly tune discovery.
2011-06-14 22:56:20 +02:00
Peter Arrenbrecht
0e9696a634 wireproto: add batching support to wirerepository
Adds the plumbing and wire call for batched execution, but does not
batch-enable any methods yet.
2011-06-14 22:52:58 +02:00
Peter Arrenbrecht
9870a43596 wireproto: add basic command batching infrastructure
Note that localbatch will not be used until we actually have a localpeer to
use it with.
2011-06-14 22:51:26 +02:00
Yuya Nishihara
6cb9c38b6d mq: make qrefresh/qfold keep wlock until saving patch status
Because q.refresh() changes nodeid, .hg/patches/status gets invalid until
q.savedirty(). This patch changes mq not to unlock repository of incomplete
state.
2011-06-15 01:50:49 +09:00
Wagner Bruna
e9d8028876 bugzilla: fix typo in documentation 2011-06-14 20:08:35 -03:00
Idan Kamara
c2b2fe4489 dispatch: fix for-loop variable name 2011-06-14 20:25:38 +03:00
Ingo Bressler
215b100937 notify: send changesets on 'outgoing' hook, updated doc 2011-06-14 13:29:25 +02:00
Stephen Thorne
8176bbbdf9 sslutil: Restore missing imports of socket and httplib to sslutil
Two imports were omitted in the restructure of the code creating
sslutil.py, socket and httplib are required when the 'ssl' module
cannot be imported, restoring these imports allows mercurial to run
on python2.4+2.5.
2011-06-14 13:31:32 +10:00
Alexander Sauta
2e47205767 i18n-ru: translated all standard commands and config-environment additional help topics 2011-06-14 00:31:56 +04:00
Alexander Sauta
464f2fcf79 i18n-ru: translated push-rename 2011-06-10 01:39:22 +04:00
Alexander Sauta
45ddc7de88 i18n-ru: translated parents-pull 2011-06-09 20:37:32 +04:00
Idan Kamara
c08a096623 dispatch: assign I/O descriptors from the request to the ui 2011-06-08 14:54:47 +03:00
Idan Kamara
325f77da0a ui: use I/O descriptors internally
and as a result:
- fix webproto to redirect the ui descriptors instead of sys.stdout/err
- fix sshserver to use the ui descriptors
2011-06-08 01:39:20 +03:00
Idan Kamara
e05ad378b0 dispatch: add I/O descriptors to the request 2011-06-07 13:39:09 +03:00
Idan Kamara
d3e4ddd52a ui: add I/O descriptors 2011-06-07 13:39:09 +03:00
Patrick Mezard
fd8786d770 import: add --bypass option
This feature is more a way to test patching without a working directory than
something people asked about. Adding a --rev option to specify the parent patch
revision would make it a little more useful.

What this change introduces is patch.repobackend class which let patches be
applied against repository revisions. The caller must supply a filestore object
to receive patched content, which can be turned into a memctx with
patch.makememctx() helper.
2011-06-14 23:26:35 +02:00