| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
changeset |
files
|
| Sun, 11 Oct 2015 20:12:12 -0700 |
Siddharth Agarwal |
merge: introduce a preresolve function
|
changeset |
files
|
| Sun, 11 Oct 2015 18:37:54 -0700 |
Siddharth Agarwal |
merge.mergestate._resolve: also return completed status
|
changeset |
files
|
| Sun, 11 Oct 2015 18:29:50 -0700 |
Siddharth Agarwal |
merge.mergestate: add a wrapper around resolve
|
changeset |
files
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
changeset |
files
|
| Sun, 11 Oct 2015 15:04:00 -0700 |
Siddharth Agarwal |
filemerge: clean up some dead code
|
changeset |
files
|
| Mon, 12 Oct 2015 14:15:04 -0400 |
Augie Fackler |
run-tests: add b-prefix on two strings to fix python3 support
|
changeset |
files
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
changeset |
files
|
| Sun, 11 Oct 2015 20:04:40 -0700 |
Siddharth Agarwal |
filemerge: only copy to backup during premerge step
|
changeset |
files
|
| Sun, 11 Oct 2015 20:02:53 -0700 |
Siddharth Agarwal |
filemerge: only print out "merging f" output at premerge step
|
changeset |
files
|
| Thu, 08 Oct 2015 00:19:20 -0700 |
Siddharth Agarwal |
filemerge: deindent the parts of filemerge outside the try block
|
changeset |
files
|
| Sun, 11 Oct 2015 20:47:04 -0700 |
Siddharth Agarwal |
filemerge: introduce a premerge flag and function
|
changeset |
files
|
| Sun, 11 Oct 2015 12:56:21 -0700 |
Siddharth Agarwal |
filemerge: also return whether the merge is complete
|
changeset |
files
|
| Sun, 11 Oct 2015 12:31:08 -0700 |
Siddharth Agarwal |
filemerge: add a wrapper around the filemerge function
|
changeset |
files
|
| Fri, 09 Oct 2015 01:19:37 +0200 |
Mads Kiilerich |
context: don't hex encode all unknown 20 char revision specs (issue4890)
|
changeset |
files
|
| Mon, 12 Oct 2015 00:45:24 -0700 |
Pierre-Yves David |
discovery: put trivial branch first
|
changeset |
files
|
| Fri, 09 Oct 2015 15:31:50 -0700 |
Pierre-Yves David |
shelve: rename 'publicancestors' to something accurate (issue4737)
|
changeset |
files
|
| Fri, 09 Oct 2015 12:30:46 -0500 |
Nathan Goldbaum |
makefile: add wheel build target
|
changeset |
files
|
| Fri, 09 Oct 2015 12:25:51 -0500 |
Nathan Goldbaum |
setup: import setup from setuptools if FORCE_SETUPTOOLS is set
|
changeset |
files
|
| Mon, 12 Oct 2015 14:46:51 +0100 |
Gijs Kruitbosch |
hgweb: remove obsolete -webkit-border-radius property
|
changeset |
files
|
| Mon, 12 Oct 2015 15:20:04 +0800 |
Anton Shestakov |
monoblue: add a link to the latest file revision
|
changeset |
files
|
| Fri, 09 Oct 2015 15:44:00 -0700 |
Pierre-Yves David |
discovery: reference relevant bug in the faulty code
|
changeset |
files
|
| Fri, 09 Oct 2015 15:37:05 -0700 |
Pierre-Yves David |
discovery: fix a typo in a comment
|
changeset |
files
|
| Fri, 09 Oct 2015 14:59:37 -0700 |
Pierre-Yves David |
getsubset: get the unpacker version from the bundler
|
changeset |
files
|
| Mon, 12 Oct 2015 15:42:32 +0300 |
Emanuele Giaquinta |
test-convert-cvs: add sleep so cvs notices changes
|
changeset |
files
|
| Wed, 07 Oct 2015 11:33:52 +0300 |
Emanuele Giaquinta |
cvsps: fix computation of parent revisions when log caching is on
|
changeset |
files
|
| Tue, 06 Oct 2015 16:26:20 -0500 |
Matt Mackall |
dirstate: batch calls to statfiles (issue4878)
|
changeset |
files
|
| Sun, 11 Oct 2015 18:30:47 +0900 |
Yuya Nishihara |
parsers: fix infinite loop or out-of-bound read in fm1readmarkers (issue4888)
|
changeset |
files
|
| Sun, 11 Oct 2015 18:41:41 +0900 |
Yuya Nishihara |
parsers: read sizes of metadata pair of obsolete marker at once
|
changeset |
files
|
| Wed, 07 Oct 2015 21:51:24 -0700 |
Siddharth Agarwal |
filemerge: clean up temp files in a finally block
|
changeset |
files
|
| Thu, 08 Oct 2015 12:53:09 -0700 |
Pierre-Yves David |
check-code: detect and ban 'util.Abort'
|
changeset |
files
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
changeset |
files
|
| Mon, 05 Oct 2015 22:49:24 -0700 |
Pierre-Yves David |
eol: rename 'error' to 'haserror'
|
changeset |
files
|
| Mon, 05 Oct 2015 22:29:57 -0700 |
Pierre-Yves David |
discovery: rename 'error' to 'errormsg'
|
changeset |
files
|
| Mon, 05 Oct 2015 16:44:45 -0700 |
Christian Delahousse |
histedit: delete histedit statefile on any exception during abort
|
changeset |
files
|
| Tue, 06 Oct 2015 15:09:28 -0700 |
Christian Delahousse |
histedit: check presence of statefile before deleting it
|
changeset |
files
|
| Mon, 05 Oct 2015 16:34:17 -0700 |
Christian Delahousse |
histedit: add inprogress method to state class
|
changeset |
files
|
| Fri, 09 Oct 2015 03:53:47 +0900 |
FUJIWARA Katsunori |
commands: use dirstateguard instead of begin/end-parentchange for backout
|
changeset |
files
|
| Fri, 09 Oct 2015 03:53:47 +0900 |
FUJIWARA Katsunori |
commands: make "hg import" use dirstateguard only for --no-commit
|
changeset |
files
|
| Fri, 09 Oct 2015 03:53:46 +0900 |
FUJIWARA Katsunori |
cmdutil: stop tryimportone from using dirstateguard (BC)
|
changeset |
files
|
| Fri, 09 Oct 2015 03:53:46 +0900 |
FUJIWARA Katsunori |
dirstate: remove meaningless dirstateguard
|
changeset |
files
|
| Fri, 09 Oct 2015 03:53:46 +0900 |
FUJIWARA Katsunori |
localrepo: execute appropriate actions for dirstate at releasing transaction
|
changeset |
files
|
| Fri, 09 Oct 2015 03:53:46 +0900 |
FUJIWARA Katsunori |
transaction: add releasefn to notify the end of a transaction scope
|
changeset |
files
|
| Wed, 07 Oct 2015 23:35:30 -0700 |
Siddharth Agarwal |
filemerge: move post-merge checks into a separate function
|
changeset |
files
|
| Thu, 08 Oct 2015 14:18:43 -0700 |
Siddharth Agarwal |
filemerge._xmerge: drop no longer necessary 'if r:' check
|
changeset |
files
|
| Thu, 08 Oct 2015 14:17:31 -0700 |
Siddharth Agarwal |
filemerge._idump: drop no longer necessary 'if r:' check
|
changeset |
files
|
| Thu, 08 Oct 2015 14:16:19 -0700 |
Siddharth Agarwal |
filemerge._merge: drop no longer necessary 'if r:' check
|
changeset |
files
|
| Mon, 05 Oct 2015 02:33:45 -0700 |
Pierre-Yves David |
revset: delete _updatedefaultdest as it has no users
|
changeset |
files
|
| Mon, 28 Sep 2015 22:11:23 -0700 |
Pierre-Yves David |
merge: get the default update destination from the function
|
changeset |
files
|
| Mon, 05 Oct 2015 01:46:47 -0700 |
Pierre-Yves David |
update: move default destination computation to a function
|
changeset |
files
|
| Thu, 08 Oct 2015 10:57:03 -0700 |
Gregory Szorc |
worker: restore old countcpus code (issue4869)
|
changeset |
files
|
| Wed, 07 Oct 2015 21:22:16 -0700 |
Siddharth Agarwal |
filemerge: call premerge directly from main merge function
|
changeset |
files
|
| Mon, 05 Oct 2015 16:19:54 -0700 |
Durham Goode |
bundle2: allow lazily acquiring the lock
|
changeset |
files
|
| Tue, 06 Oct 2015 14:42:29 -0700 |
Durham Goode |
bundle2: add op.gettransaction() to handlers that need the lock
|
changeset |
files
|
| Thu, 08 Oct 2015 17:44:22 -0500 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Thu, 01 Oct 2015 23:13:57 -0700 |
Pierre-Yves David |
patchbomb: add a 'bundletype' config under 'patchbomb'
|
changeset |
files
|
| Wed, 07 Oct 2015 13:05:25 -0700 |
Pierre-Yves David |
import: allow processing of extra part header after import
|
changeset |
files
|
| Tue, 06 Oct 2015 09:51:24 -0700 |
Pierre-Yves David |
import: allow processing of extra part header during import
|
changeset |
files
|
| Tue, 06 Oct 2015 02:23:21 -0700 |
Pierre-Yves David |
extract: parse 'nodeid' using the generic mechanism
|
changeset |
files
|
| Tue, 06 Oct 2015 02:22:23 -0700 |
Pierre-Yves David |
extract: parse 'branch' using the generic mechanism
|
changeset |
files
|