Commit Graph

3087 Commits

Author SHA1 Message Date
Andrei Vermel
13bbba1de3 color.py - clear _terminfo_params in win32 mode 2011-07-29 15:36:27 +04:00
Augie Fackler
88cecc18f1 rebase: remove trailing whitespace found by check-code 2011-07-21 15:56:15 -05:00
Stefano Tortarolo
1f811e0952 rebase: block collapse with keepbranches on multiple named branches (issue2112)
Collapse and keepbranches should be blocked when there is more than
one named branch on the branch that's going to be rebased.
2011-07-18 22:58:21 +02:00
Stefano Tortarolo
80ea985fc0 rebase: reset bookmarks (issue2265 and issue2873) 2011-07-15 20:07:19 +02:00
Nicholas Riley
8b7c28a23b eol: ignore IOError from deleted files in commitctx
A Mercurial repo signals a file is deleted by raising IOError when the
file's data is requested.  This IOError is normally caught by
localrepository.commitctx.  With the eol extension enabled and EOL
mappings in place, the eolrepo subclass should ignore IOError because
a deleted file has no line endings to process.

This issue exhibited itself when performing an incremental hg convert
of a revision with deleted files to a repo with an existing .hgeol
file.
2011-07-12 12:06:11 -04:00
Cédric Krier
acde2a727f hgcia: Set default value of strip to -1 (issue2891)
For backward compatibility the root path of the repository is not
displayed unless the user has specified an explicit strip value.
2011-07-09 09:44:15 +02:00
Shun-ichi GOTO
add6b2013e win32mbcs: wrap two more functions to be wrapped.
util.checkwinfilename() and util.checkosfilename() are wrapped.
The former, used by scmutil, is not friendly for Shift_JIS bytes.
The latter is an dynamic alias of checkwinfilename() used by other
modules.
2011-07-06 18:28:42 +09:00
Brodie Rao
e231f6710d color: for the sake of "less -R", default to ansi in auto mode (issue2792)
less with the -R option only supports ANSI color codes, and terminfo
mode issue non-ANSI color codes (depending on the database). The -r
option can work around this, but there are users currently using the
-R option, and defaulting to terminfo would break colorization in less
for them without warning.
2011-06-29 13:20:40 -04:00
Brodie Rao
5123ea27df color: fix TypeError with auto mode on win32 when colors aren't available (issue2871)
This can happen when stdout isn't a terminal (e.g., it's being piped).
2011-06-29 13:20:39 -04:00
Danek Duvall
748bbc348d color: be silent when falling back to ECMA-48 mode if "auto" mode was desired
Don't warn about missing setab/setaf terminfo entries unless we explicitly
asked for terminfo mode; fallback to ECMA-48 mode silently.
2011-06-27 11:36:42 -07:00
Idan Kamara
dedd139496 transplant: use ui out descriptor when calling util.system 2011-06-24 19:27:53 +03:00
Idan Kamara
09b97b7cff extdiff: use ui out descriptor when calling util.system 2011-06-24 17:04:37 +03:00
Mads Kiilerich
9013069b41 convert: fix git convert on solaris - it cannot remove environment variables 2011-06-25 01:55:15 +02:00
Idan Kamara
73a82e0b84 backout of a52e14fe37fb: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:

1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
   (new behavior would only fail if the outstanding changes and the patches
   changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch

It's worth considering if we can move this behavior to -f in the future.
2011-06-24 23:25:42 +03:00
Matt Mackall
f65681314b check-code: don't mark debug messages for translation 2011-06-21 15:21:57 -05:00
Matt Mackall
5ab97592f7 scmutil: switch match users to supplying contexts
The most appropriate context is not always clearly defined. The obvious cases:

For working directory commands, we use None
For commands (eg annotate) with single revs, we use that revision

The less obvious cases:

For commands (eg status, diff) with a pair of revs, we use the second revision
For commands that take a range (like log), we use None
2011-06-18 16:52:51 -05: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
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
Ingo Bressler
215b100937 notify: send changesets on 'outgoing' hook, updated doc 2011-06-14 13:29:25 +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
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
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