Commit Graph

26159 Commits

Author SHA1 Message Date
Anton Shestakov
9643ca35f2 gitweb, monoblue: fix vertical align of spans in .sourcelines
Empty lines in file view could produce an inexplicable margin before the next
line (most noticeable in browsers on webkit/blink engine). That was making
empty lines seem taller than the rest.

Instead of using default vertical align, let's set it to 'top'.

This issue is actually present in paper, and only recently got into gitweb
(0609781075c1) and monoblue (b7a7757577fb). There's a bit more to it in paper,
so that will be dealt with in a future patch.

Recipe to see live: preferably using a webkit/blink browser, such as chromium,
browse a file with empty lines, e.g. https://selenic.com/hg/file/3.5/README#l8
Selecting a block of text that includes empty lines will reveal white "breaks"
in the selection. Highlighted line (#l8) also shows such a break below itself.
2015-09-25 03:02:38 +08:00
timeless@mozdev.org
bbe814936e merge: fix mergestate comment 2015-09-25 00:54:20 -04:00
timeless@mozdev.org
e4c8525ba7 rebase: avoid losing branch commits with --keepbranch (issue4835) 2015-09-24 17:51:05 -04:00
Siddharth Agarwal
ce3fd41292 lock.release: do not unlink inherited locks
This is part of a series that will allow locks to be inherited by subprocesses
in limited circumstances. A subprocess unlinking a lock will lead to potential
corruption from other concurrent processes.
2015-09-24 16:03:26 -07:00
Siddharth Agarwal
9fe251823c lock: add a method to reacquire the lock after subprocesses exit
This is part of a series that will allow locks to be inherited by subprocesses
in limited circumstances.
2015-09-24 16:00:41 -07:00
Siddharth Agarwal
781395377d lock: add a method to prepare the lock for inheritance
This is part of a series that will allow locks to be inherited by subprocesses
in limited circumstances.
2015-09-24 10:37:13 -07:00
Siddharth Agarwal
3efac149fd lock: introduce state to keep track of inheritance
This is part of a series that will allow locks to be inherited by subprocesses
in limited circumstances. In upcoming patches we will refer to this state.
2015-09-24 15:57:11 -07:00
Siddharth Agarwal
9bb5535bd0 error: add an exception to indicate lock inheritance API contract violations 2015-09-24 10:53:16 -07:00
Sean Farley
dfae17fe18 clone: check update rev for being True
In 03e658289ff6, there was an attempt to fallback to looking up the update
revision assuming it was always a rev but the documentation states:

  True means update to default rev, anything else is treated as a revision

Therefore, we should only fallback to looking up the update rev if it is not
True. This bug was found in hg-git and I couldn't think of a test that does
this in pure Mercurial since the source repository is checked for the revision
as well (and therefore gracefully falls back).
2015-09-24 15:52:11 -07:00
Sean Farley
d60ee8978f clone: fix over-indented continuation line 2015-09-24 15:47:23 -07:00
timeless@mozdev.org
776539bcbf resolve: consistently describe re-merge + unresolved 2015-09-25 03:51:46 -04:00
liscju
c4c7beba44 mercurial: add debugextensions command (issue4676)
Add debugextensions command to help users debug their extension
problems. If there are no extensions command prints nothing,
otherwise it prints names of extension modules. If quiet or
verbose option is not specified it prints(after extensions name)
last version of mercurial in which given module was tested for
non internal modules or not tested with user mercurial version.

If verbose is specified it prints following information for every
extension: extension name, import source, testedwith and buglink
information.

Extensions are printed sorted by extension name.
2015-09-10 16:53:07 +02:00
Daniel Colascione
4eefceee97 dispatch: stop warning about EPIPE in --debug mode
It seems silly for "hg --debug manifest | less" to print a scary
message after the user hits "q" in less.  hg should just exit silently
instead, since EPIPE on stdout is a perfectly reasonable result.
2015-09-24 10:15:37 +03:00
Laurent Charignon
1cb3086e23 rebase: don't rebase obsolete commit whose successor is already rebased
This patch avoids unnecessary conflicts to resolve during rebase for the users
of changeset evolution.

This patch modifies rebase to skip obsolete commits if they are being rebased on
their successors.
It introduces a new rebase state 'revprecursor' for these revisions that are
being skipped and a new message to inform the user of what is happening.
This feature is gated behind the config flag experimental.rebaseskipobsolete

When an obsolete commit is skipped, the output is:
not rebasing 14:9ad579b4a5de "I", already in destination as 17:fc37a630c901 "K"
2015-09-14 17:31:48 -07:00
Pierre-Yves David
b2cac2b8b4 check-code: forbid mutable value for default argument
default value are common to all call. Using mutable value is a classical source
of bug in Python. We forbid it.

The regexp (Courtesy of Matt Mackall) is only catching such value on the first
line of a definition, but that will be good enough for now.
2015-09-24 00:34:15 -07:00
Pierre-Yves David
2dc338dc47 httpconnection: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:54:30 -07:00
Pierre-Yves David
7b5d19b0d7 transplant: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:52:21 -07:00
Pierre-Yves David
4756d21a63 mq: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs. The
underlying function already handle "None" as an option value, so we do not need
to do anything else.
2015-09-24 00:50:06 -07:00
Pierre-Yves David
a551464cdd largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:49:02 -07:00
Pierre-Yves David
ffcbdf7cc8 largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:48:24 -07:00
Pierre-Yves David
cdc21e7de4 largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:48:02 -07:00
Pierre-Yves David
4838705431 largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:46:37 -07:00
Pierre-Yves David
40bf417522 largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:46:12 -07:00
Pierre-Yves David
ef62bb6e54 largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:44:59 -07:00
Pierre-Yves David
4dc7b8ccac largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:44:32 -07:00
Pierre-Yves David
a7ba280694 largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:41:43 -07:00
Pierre-Yves David
28f9483962 largefiles: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:40:53 -07:00
Pierre-Yves David
374e65cff5 histedit: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:38:34 -07:00
Pierre-Yves David
6988077eb7 templater: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:07:09 -07:00
Pierre-Yves David
031cb65d89 templater: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:06:41 -07:00
Pierre-Yves David
3ea92affd9 templater: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:06:10 -07:00
Pierre-Yves David
21ad2eebc2 templater: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:05:21 -07:00
Pierre-Yves David
9bd6d983a9 templater: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:04:58 -07:00
Pierre-Yves David
170f50272a addremove: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:04:10 -07:00
Pierre-Yves David
ab85f23ec7 match: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs. We
added support for None in the underlying function in the parent commit.
therefore we do not need to do anything but passing None.
2015-09-24 01:00:43 -07:00
Pierre-Yves David
6b8997438d match: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:00:25 -07:00
Pierre-Yves David
e3e8ecef87 match: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:00:05 -07:00
Pierre-Yves David
9e29f38f43 match: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:59:26 -07:00
Pierre-Yves David
124b8948d8 addremove: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 01:58:33 -07:00
Pierre-Yves David
d40a9362d5 tag: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs. We
just added support of None for the underlying function, so nothing else the
required.
2015-09-24 00:56:30 -07:00
Pierre-Yves David
b866453be7 commit: remove a mutable default argument
Mutable default arguments are know to the state of California to cause bugs.
2015-09-24 00:56:18 -07:00
Siddharth Agarwal
0edaba580a lock: move acquirefn call to inside the lock
We're going to need to call it again as part of reinitialization after a
subprocess inherits the lock.
2015-09-22 14:09:42 -07:00
Siddharth Agarwal
f272abff39 localrepo: call lock.lock with releasefn as a keyword arg
We'll be adding an acquirefn argument soon, and this makes that clearer.
2015-09-22 13:25:41 -07:00
Matt Mackall
846cb052bb copies: move debug statement to appropriate place 2015-08-19 15:11:17 -05:00
Matt Mackall
b73f713c00 bidmerge: choose shortest list of diverge and rename/delete warnings
Slightly less arbitrary than choosing the first set.
2015-08-19 14:05:42 -05:00
Matt Mackall
06dcd73aae copies: rename diverge2 to divergeset for clarity 2015-08-19 14:04:54 -05:00
Matt Mackall
cf71f5908f copies: begin separating mergecopies sides 2015-08-19 13:40:18 -05:00
Matt Mackall
a37c0c906b copies: rename ctx() to getfctx() for clarity 2015-08-19 13:09:54 -05:00
Anton Shestakov
386f39d602 monoblue: port code selection without line numbers from gitweb
This is adapted from 0609781075c1.

It also fixes issue4790 in monoblue; tab characters now have meaningful width on
the modified pages (file view, file diff, changeset).
2015-09-23 16:02:35 +08:00
Kevin Bullock
55b433ef64 help: copy-edit description of ui.supportcontact 2015-09-22 15:10:24 -05:00