Commit Graph

5307 Commits

Author SHA1 Message Date
Matt Mackall
de712b58f9 walkchangerevs: move 'add' to callback
Now walkchangerevs is a simple iterator over contexts
2009-10-29 17:07:51 -05:00
Yuya Nishihara
ac33bbc42b extensions: changed to call extsetup() from extensions.loadall()
previously uisetup() was invoked by extensions.loadall(), but
extsetup() was by _dispatch().

there's no need to split them because we have nothing to do
between uisetup() and extsetup().

this fixes issue1824 indirectly.
2009-10-28 23:55:23 +09:00
Sune Foldager
ba068758a6 hook: only redirect stdout if it and stderr are valid files
When using hgwebdir with WSGI via the IIS ISAPI-WSGI extension, both
stdout and stderr filenos are set to -2, which makes the os.dup call
in hook.py fail.
2009-10-28 21:35:57 +01:00
Matt Mackall
a777761788 verify: filter the candidate list for broken linkrevs 2009-10-28 13:17:03 -05:00
Matt Mackall
74ca11743b Merge with crew 2009-10-27 17:14:19 -05:00
Matt Mackall
0366236cf5 walkchangerevs: internalize ctx caching 2009-10-27 17:01:32 -05:00
Sune Foldager
acad01d54e bundlerepo: fix small bug in exception raising 2009-10-27 10:33:41 +01:00
Matt Mackall
67e7c0b434 walkchangerevs: yield contexts 2009-10-25 18:43:59 -05:00
Matt Mackall
201d81ac28 walkchangerevs: kill window step of iterator 2009-10-25 18:43:58 -05:00
Matt Mackall
69f8478d8c walkchangerevs: pull out matchfn
* * *
imported patch mercurial/commands.py
2009-10-25 18:43:56 -05:00
timeless@mozdev.org
1834479e5a minor documentation improvements 2009-10-25 14:45:38 +02:00
timeless
1ed92a7db7 commands: adding --no-status to resolve to match status 2009-10-25 13:27:54 +01:00
timeless@mozdev.org
33195b8982 commands: use rev from remote repo when updating as part of a pull 2009-10-21 12:41:28 +03:00
timeless@mozdev.org
eb0032e7aa commands: highlighting that rev is based on the remote repository 2009-10-21 12:03:14 +03:00
Brodie Rao
7c2f2247c5 diffstat: with --git, mark binary files with Bin
Normally, diffs without any text insertions or deletions are reported
as having 0 lines changed by stock diffstat. Compatibility is
preserved with stock diffstat in this case, but when using --git,
binary files are marked with Bin as a means of clarification.

git diff --stat does something similar, though it also includes the
old and new file sizes.
2009-10-25 02:53:33 +02:00
Brodie Rao
8c7629d9e4 diff: add --stat for diffstat output
diff/qdiff --stat invokes patch.diffstat() on the diff output.

When in interactive mode, the output's maximum width is determined by the
terminal's width.
2009-10-25 02:52:35 +02:00
Brodie Rao
cd4a91c73f diffstat: print 0 instead of nothing for 0 adds or removes
This is in line with how the stock diffstat behaves when processing a
single diff with no line modifications (like a binary diff).
2009-10-25 02:35:35 +02:00
Adrian Buehlmann
c0985715f7 cmdutil: minor refactoring of changeset_printer._show
- use ctx.branch() instead of directly accessing the extra field "branch"
- move definitions of locals ('extra' and 'branch') down to where they
  are used
2009-10-24 19:01:40 +02:00
Martin Geisler
881b938c98 commands: search for translated version of "DEPRECATED"
The option description is already translated at this point, so we must
search for a translation of "DEPRECATED".
2009-10-24 00:29:25 +02:00
Nicolas Dumazet
3f248fed39 util: use sys.argv[0] if $HG is unset and 'hg' is not in PATH
This is necessary when the executable name is not 'hg'. For example,
if your system-wide mercurial is name 'hgs', sys.argv[0] is more
accurate than 'hg'.
2009-09-21 19:21:32 +02:00
Matt Mackall
e4e621eb3d summary: remove reference to -p 2009-10-21 17:42:22 -05:00
Martin Geisler
fb05a0948c minirst: convert `foo` into "foo" upon display
This lets us markup many more occurances of inline literals since they
no longer look strange in the terminal output.
2009-10-20 22:16:27 +02:00
Matt Mackall
22f2e128cf summary: add --remote 2009-10-20 11:59:38 -05:00
Matt Mackall
a6af18744b summary: restore briefer commit status 2009-10-20 11:58:09 -05:00
Matt Mackall
a69545dfc3 summary: add empty repository and no revision checked out hints 2009-10-20 11:57:25 -05:00
Matt Mackall
0a74fdabf2 Merge with crew 2009-10-19 23:53:25 -05:00
Benoit Boissinot
902529ddd6 merge with crew 2009-10-20 00:30:36 +02:00
Martin Geisler
b10a5e234c ui: only use "user@host" as username in noninteractive mode
We regularly see people on IRC ask how they can correct commits they
accidentally made without having configured a username. This change
will make Mercurial abort when a commit is made without a username.

If Mercurial is run without a TTY (from a cronjob or similar), a
username is constructed as usual. Schematically the changes are as
follows:

With ui.askusername=False:

                  old         new
  interactive     user@host   abort
  noninteractive  user@host   user@host

With ui.askusername=True:

                  old         new
  interactive     prompt      prompt
  noninteractive  user@host   user@host
2009-10-20 00:17:36 +02:00
Matt Mackall
73b30861ca Remove parents from default help in favor of summary 2009-10-19 00:36:52 -05:00
Matt Mackall
e07bd87972 summary: quieter with -q 2009-10-19 00:22:49 -05:00
Matt Mackall
2a9f330665 commands: fix missing empty synopses 2009-10-19 00:21:06 -05:00
Matt Mackall
993bb8325e Introduce summary command 2009-10-18 22:31:05 -05:00
Adrian Buehlmann
a482b04850 hg.clone: report branch name on update 2009-10-16 23:57:34 +02:00
Alexander Solovyov
32999e4659 make path expanding more consistent
This expands ~user and $FOO constructs in ui.ignore files, [defaults],
[paths], extension paths, and HGRCPATH files.
2009-10-19 22:19:28 +03:00
David Soria Parra
38f791302b commands: clarify output for the commit summary
It is not clear what is meant with '2 modified, 3 unknown'. We clarify
this by writing '2 modified files, 3 unknown files' instead.
2009-10-19 07:14:44 +02:00
Martin Geisler
a806763de0 commands: do not split a translated string
Splitting the string after translation relies on the implicit
assumption that translators will always translate the English words
using single foreign words.

Also, when translating we want as much context as possible so I've
moved the string formatting into the translatable string.
2009-10-19 14:37:37 +02:00
Patrick Mezard
990e7895a0 Merge with crew-stable 2009-10-16 00:06:23 +02:00
Patrick Mezard
7b9a712086 patch: handle symlink updates/replacements (issue1785) 2009-10-15 23:15:30 +02:00
Patrick Mezard
5c89cb752a patch: handle symlinks without symlinkhunk
Symlink creations and deletions were handled with a special symlinkhunk object,
working like a binary hunk. However, this model does not support symlink
updates or replacements, so we teach regular hunks how to handle symlinks.
2009-10-15 23:15:30 +02:00
Matt Mackall
207b3fe6fe bisect: use util.system and fix good/bad when using -c
The existing scheme using util.find_exe and subprocess.call meant we
couldn't use simple shell commands in tests. Fix that.

Also, it mistakenly used status from the system() call rather than
good from the bisect call in reporting results.
2009-10-12 18:25:46 -05:00
Matt Mackall
34aac1e48a bisect: limit considered set to descendants of first good rev 2009-10-12 14:59:28 -05:00
Dirkjan Ochtman
2b60214db7 merge with hg-stable 2009-10-10 12:19:58 +02:00
Dirkjan Ochtman
02b4677d86 encoding: fix issue with non-standard UTF-8 CTYPE on OS X 2009-10-10 12:00:43 +02:00
Patrick Mezard
a7d029beb4 patch: do not swallow header-like patch first line (issue1859)
Current solution is hackish but looks like a good trade-off short of rewriting
patch.extract() significantly.
2009-10-08 23:42:33 +02:00
Patrick Mezard
6815e3dc8d windows: fix unlink() not dropping empty tree (issue1861) 2009-10-08 23:32:36 +02:00
Matt Mackall
b6547e5312 Merge with stable 2009-10-11 13:54:19 -05:00
Matt Mackall
20668220a1 Merge with -stable 2009-10-08 00:59:46 -05:00
Matt Mackall
daf9754427 Merge with -crew-stable 2009-10-07 23:25:41 -05:00
Adrian Buehlmann
db3cee7306 util: move rename into posix.py and windows.py 2009-10-07 20:32:07 +02:00
Adrian Buehlmann
d2944ad3db util: state docstring of rename more precisely 2009-10-07 20:16:43 +02:00