Commit Graph

14543 Commits

Author SHA1 Message Date
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
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
Patrick Mezard
7350aaca49 import: separate parents selection from working dir update
This will be useful when patching without updating the dirstate
2011-06-14 23:24:40 +02:00
Patrick Mezard
9a9794b348 patch: extend filtestore to store an optional copy source
This will help wrapping filestores in memctx.
2011-06-14 23:24:34 +02:00
Martin Geisler
4ebded65b3 paper/coal: use fixed width for diffstat +/- link
The plus and minus characters are normally not the same width in a
non-monospace font, and this made the line length change when the
diffstat display was toggled.

The square brackets are not rendered in a monospace font to ensure
that they align with the parenthesis on the same line.
2011-06-14 16:38:34 +02:00
Martin Geisler
7e528c7c9a hg: rename opts argument to peeropts in clone
This should make it clearer that the options are used with remoteui
only and are not used otherwise in hg.clone.
2011-06-14 16:33:46 +02:00
Matt Mackall
f0bc90519a hg: move peerschemes back to schemes
This will avoid breaking things with extensions until peers are fully
separated from repos.
2011-06-13 16:25:18 -05:00
Matt Mackall
f241322d80 hg: rearrange peer scheme lookup
There is now only peer scheme lookup. Repository lookup goes through
peer scheme lookup. When peer and repo types are finally separated,
repo lookup will use peer.local() to get a repository object.

The underbar is dropped so that extensions can patch the table.
2011-06-13 14:53:23 -05:00
Idan Kamara
692ba2f2fc forget, remove: don't note on nonexistent file twice
before:
  $ hg forget foo
  foo: No such file or directory
  not removing foo: file is already untracked

after:
  $ hg forget foo
  foo: No such file or directory
2011-06-13 14:56:00 +03:00
Matt Mackall
abe73723fb localrepo: local() returns self
Temporary measure for introducing peers
2011-06-13 12:51:38 -05:00
Matt Mackall
387d1df194 tests: avoid instability in test-convert-cvs-synthetic 2011-06-13 12:51:37 -05:00
Idan Kamara
b335d3e278 dispatch: propagate ui command options to the local ui (issue2523)
so the ui object passed to pre/post python hooks has the verbose flag
(and the rest) set correctly
2011-06-13 00:19:26 +03:00
Idan Kamara
68a8ad822b mq: catch correct exception when calling changelog.rev() 2011-06-12 23:30:39 +03:00
Idan Kamara
f092316574 rebase: preserve mq series order after rebasing (issue2849) 2011-06-12 17:26:58 +03:00
Idan Kamara
cf84c46249 run-tests: verbose log ignored test 2011-06-12 17:26:20 +03:00
Ingo Proetel
bef424c7fa record: add white space diff options 2011-06-10 10:58:10 +02:00
Adrian Buehlmann
78057a0d0f mq: rename abort_if_wdir_patched to abortifwdirpatched 2011-06-13 13:53:58 +02:00
Adrian Buehlmann
d3203ca1e7 mq: rename partial_name to partialname 2011-06-13 13:48:47 +02:00
Adrian Buehlmann
49d1864937 mq: rename write_list to writelist 2011-06-13 13:47:21 +02:00
Adrian Buehlmann
2e1cbd3d6d mq: rename series_dirty to seriesdirty 2011-06-13 13:45:48 +02:00
Adrian Buehlmann
15894cb481 mq: rename applied_dirty to applieddirty 2011-06-13 13:44:34 +02:00
Adrian Buehlmann
fc52238182 mq: rename guards_dirty to guardsdirty 2011-06-13 13:43:03 +02:00
Adrian Buehlmann
a91ab088dd mq: rename active_guards to activeguards 2011-06-13 13:41:58 +02:00
Adrian Buehlmann
c2841bd2c6 mq: rename guards_path to guardspath 2011-06-13 13:40:35 +02:00
Adrian Buehlmann
7830664889 mq: rename status_path to statuspath 2011-06-13 13:39:14 +02:00
Adrian Buehlmann
f6a797789d mq: rename series_path to seriespath 2011-06-13 13:38:04 +02:00
Adrian Buehlmann
75d2af97af mq: rename series_end to seriesend 2011-06-13 12:11:49 +02:00
Adrian Buehlmann
65422d1bc9 mq: rename full_series_end to fullseriesend 2011-06-13 12:09:29 +02:00
Adrian Buehlmann
9ac1360c75 mq: rename check_reserved_name to checkreservedname 2011-06-13 12:07:46 +02:00
Adrian Buehlmann
a7057a1a42 mq: rename check_localchanges to checklocalchanges 2011-06-13 12:06:32 +02:00
Adrian Buehlmann
87dca9fb58 mq: rename check_substate to checksubstate 2011-06-13 12:05:20 +02:00
Adrian Buehlmann
ea872e336a mq: rename check_toppatch to checktoppatch 2011-06-13 12:03:38 +02:00
Adrian Buehlmann
24dfc6dc4d mq: rename save_dirty to savedirty 2011-06-13 12:02:14 +02:00
Adrian Buehlmann
00a5574158 mq: rename explain_pushable to explainpushable 2011-06-13 12:00:56 +02:00
Adrian Buehlmann
4dce24691d mq: rename set_active to setactive 2011-06-13 11:59:35 +02:00
Adrian Buehlmann
ceb9dac69c mq: rename set_guards to setguards 2011-06-13 11:58:16 +02:00
Adrian Buehlmann
ac8c95ba7d mq: rename check_guard to checkguard 2011-06-13 11:57:21 +02:00
Adrian Buehlmann
2689b8a7ea mq: rename parse_series to parseseries 2011-06-13 11:55:46 +02:00
Adrian Buehlmann
323edaf5bd mq: rename find_series to findseries 2011-06-13 11:54:25 +02:00
Adrian Buehlmann
7ec3827482 mq: rename series_guards to seriesguards 2011-06-13 11:40:27 +02:00
Adrian Buehlmann
6eb8082b17 mq: rename full_series to fullseries 2011-06-13 11:06:11 +02:00
Steven Brown
e159db2556 paper, coal: display diffstat on the changeset page
Displayed in a row of the changeset summary table, underneath the list of
files. When the page is loaded, only the diff summary is displayed. The full
diffstat is only displayed when the [+] link is selected.
2011-06-11 21:24:50 +08:00
Steven Brown
d6246b1341 web: provide diff summary to the changeset page
This is the same message displayed at the end of the "diff --stat" command.
For example, "9 files changed, 1651 insertions(+), 2 deletions(-)".

The webutil.diffstatgen function allows the diffstat data to be lazily
calculated only once and then re-used.
2011-06-11 21:11:43 +08:00
Matt Mackall
661af7d646 tests: fix up date ambiguity in cvs test 2011-06-11 14:14:53 -05:00
Matt Mackall
aa85ea1250 hg: split peer and repo lookup tables 2011-06-11 14:14:52 -05:00