Mercurial: Graph

mergestate._resolve: handle change/delete conflicts
2015-11-20, by Siddharth Agarwal
filemerge: don't try to copy files known to be absent
2015-11-14, by Siddharth Agarwal
hgweb: use absolute_import
2015-10-31, by Yuya Nishihara
hgweb: import wsgicgi at top level
2015-11-01, by Yuya Nishihara
hgweb: import BaseHTTPServer as module at top level
2015-11-01, by Yuya Nishihara
hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol
2015-11-01, by Yuya Nishihara
filemerge: don't try using external tools on change/delete conflicts
2015-11-13, by Siddharth Agarwal
filemerge: don't attempt to premerge change/delete conflicts
2015-11-13, by Siddharth Agarwal
filemerge._mergecheck: add check for change/delete conflicts
2015-11-13, by Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
2015-11-15, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':prompt' tool
2015-11-13, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':other' merge tool
2015-11-18, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':local' merge tool
2015-11-18, by Siddharth Agarwal
merge.mergestate: compute dirstate action
2015-11-19, by Siddharth Agarwal
filemerge: return whether the file was deleted
2015-11-18, by Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools
2015-11-18, by Siddharth Agarwal
filemerge: return whether the file is deleted for nomerge internal tools
2015-11-18, by Siddharth Agarwal
mergestate: allow storing and retrieving change/delete conflicts
2015-11-18, by Siddharth Agarwal
strip: changing bookmark argument to be a list
2015-11-19, by Shubhanshu Agrawal
strip: strip a list of bookmarks
2015-11-15, by Shubhanshu Agrawal
revset: speed up '_matchfiles'
2015-11-18, by Pierre-Yves David
mergestate: handle additional record types specially
2015-11-18, by Siddharth Agarwal
test-resolve.t: remove completely unnecessary line
2015-11-18, by Siddharth Agarwal
resolve: fix incorrect merge
2015-11-18, by Siddharth Agarwal
fileset: add missing() predicate (issue4925)
2015-11-18, by liscju
webutil: make _siblings into an object with __iter__ and __len__
2015-11-10, by Anton Shestakov
mergestate: move binary format documentation into _readrecordsv2
2015-11-18, by Siddharth Agarwal
unshelve: add support for custom merge tools
2015-11-18, by Siddharth Agarwal
unshelve: shed spurious space
2015-11-18, by Siddharth Agarwal
unshelve: add -k as short form of --keep
2015-11-18, by Siddharth Agarwal
import-checker: allow symbol imports from hgweb.common and .request
2015-11-01, by Yuya Nishihara
perf: un-bitrot perfstatus
2015-11-19, by Matt Mackall
util: drop statmtimesec
2015-11-19, by Matt Mackall
util: disable floating point stat times (issue4836)
2015-11-19, by Matt Mackall
rebase: refactoring to avoid repetition of expression
2015-11-18, by Laurent Charignon
rebase: remove an unused todo
2015-11-18, by Laurent Charignon
rebase: don't rebase obsolete commits with no successor
2015-11-18, by Laurent Charignon
rebase: fix a typo in test-rebase-obsolete
2015-11-18, by Laurent Charignon
merge with stable
2015-11-18, by Matt Mackall
hgweb: unify import style of error classes
2015-11-01, by Yuya Nishihara
hgweb: do not import templatefilters.revescape and websub as symbol
2015-11-01, by Yuya Nishihara
hgweb: alias ui module as uimod
2015-11-01, by Yuya Nishihara
mergestate.commit: factor out making the list of records
2015-11-17, by Siddharth Agarwal
mergestate: move _read() call to read constructor
2015-11-17, by Siddharth Agarwal
debugmergestate: explain why we create mergestate objects directly
2015-11-17, by Siddharth Agarwal
debugdirstate: convert keyword parameters to **opts
2015-11-11, by Christian Delahousse
convert: changed test's progress output format to ignore estimate
2015-11-17, by Christian Delahousse
mq: use repo._bookmarks.recordchange instead of repo._bookmarks.write
2015-11-17, by Laurent Charignon
mq: indentation change to make the next patch more legible
2015-11-17, by Laurent Charignon
bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.write
2015-11-17, by Laurent Charignon
localrepo: put bookmark move following commit in one transaction
2015-11-18, by Laurent Charignon
test-resolve.t: switch to mergestate.read()
2015-11-17, by Siddharth Agarwal
localrepo.commit: switch to mergestate.read()
2015-11-17, by Siddharth Agarwal
fileset: switch to mergestate.read()
2015-11-17, by Siddharth Agarwal
commands.summary: switch to mergestate.read()
2015-11-17, by Siddharth Agarwal
commands.resolve: switch to mergestate.read()
2015-11-17, by Siddharth Agarwal
shelve: switch to mergestate.read()
2015-11-17, by Siddharth Agarwal
mergestate: add a constructor that reads state from disk
2015-11-17, by Siddharth Agarwal
merge.applyupdates: switch to mergestate.clean()
2015-11-17, by Siddharth Agarwal
localrepo: switch to mergestate.clean()
2015-11-17, by Siddharth Agarwal
strip: switch to mergestate.clean()
2015-11-17, by Siddharth Agarwal
mergestate: add a constructor that sets up a clean merge state
2015-11-17, by Siddharth Agarwal
mergestate: raise structured exception for unsupported merge records
2015-11-17, by Siddharth Agarwal
error: add a structured exception for unsupported merge records
2015-11-17, by Siddharth Agarwal
dirstate: back out 502b56a9e897
2015-11-17, by Bryan O'Sullivan
osutil: make statfiles check for interrupts periodically
2015-11-17, by Bryan O'Sullivan
osutil: don't leak on statfiles error
2015-11-17, by Bryan O'Sullivan
histedit: extracts _isdirtywc function
2015-11-12, by liscju
node: add 'nullhex', hex-encoded nullid
2015-11-16, by Siddharth Agarwal
filemerge: introduce class whose objects represent files not in a context
2015-11-16, by Siddharth Agarwal
filectx: add isabsent method
2015-11-16, by Siddharth Agarwal
filectx: allow custom comparators
2015-11-13, by Siddharth Agarwal
debugmergestate: print out record type for files
2015-11-13, by Siddharth Agarwal
merge.applyupdates: don't return early if merge driver's conclude failed
2015-11-15, by Siddharth Agarwal
convert: use repo._bookmarks.recordchange instead of repo._bookmarks.write
2015-11-16, by Laurent Charignon
convert: indentation change to make the next patch more legible
2015-11-16, by Laurent Charignon
strip: renaming local variables
2015-11-15, by Shubhanshu Agrawal
test-rename-merge2: make selected output less arbitrary
2015-02-11, by Martin von Zweigbergk
test-convert-git: drop a git warning that doesn't occur on Windows
2015-11-15, by Matt Harbison
tests: fix globs for Windows
2015-11-15, by Matt Harbison
pull: return 255 value on update failure (issue4948) (BC)
2015-11-15, by liscju
filemerge: remove leading space from " no tool found..."
2015-11-11, by Martin von Zweigbergk
test-encoding: enable fuzz testing of utf8b roundtrip
2015-11-09, by Yuya Nishihara
import-checker: reset context to verify convention in function scope
2015-11-01, by Yuya Nishihara
import-checker: allow import of child modules from package root
2015-11-01, by Yuya Nishihara
encoding: extend test cases for utf8b
2015-11-02, by Matt Mackall
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
2015-11-13, by Siddharth Agarwal
merge: stop emptying out 'cd' and 'dc' actions
2015-11-13, by Siddharth Agarwal
rebase: add returning value from pullrebase function stable
2015-11-15, by liscju
resolve: restore .orig only after merge is fully complete (issue4952) stable
2015-11-13, by Siddharth Agarwal
monoblue: add a space to separate navigation links in file log footer
2015-11-06, by Anton Shestakov
merge: move messages about possible conflicts a litte earlier
2015-11-12, by Martin von Zweigbergk
import-checker: include lineno in warning message
2015-11-01, by Yuya Nishihara
import-checker: extract function to generate a formatted warning
2015-11-01, by Yuya Nishihara
import-checker: make it executable for convenience
2015-11-01, by Yuya Nishihara
test-fileset: glob the updated file count for Windows stability
2015-11-09, by Matt Harbison
tests: tolerate differences between Linux and Windows error strings
2015-11-09, by Matt Harbison
test-largefiles-cache: add glob for Windows
2015-11-09, by Matt Harbison
tests: make 'f' tool open files in binary mode when hexdumping
2015-11-09, by Matt Harbison
merge.applyupdates: only attempt to merge files in mergeactions
2015-11-12, by Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck
2015-11-11, by Siddharth Agarwal
test-merge-prompt.t: rename to test-merge-changedelete.t
2015-11-11, by Siddharth Agarwal
merge with stable
2015-11-12, by Matt Mackall
tags: create new sortdict for performance reasons stable
2015-11-12, by Gregory Szorc
largefiles: specify where .orig files are kept
2015-11-10, by Christian Delahousse
mq: let the user choose where .orig files are kept
2015-11-10, by Christian Delahousse
shelve: choose where .orig file locations are kept
2015-11-10, by Christian Delahousse
filemerge: choose where .orig files are kept
2015-11-10, by Christian Delahousse
git-subrepos: revert respects specified location to save .orig files
2015-11-10, by Christian Delahousse
resolve: choose where .orig file locations are kept
2015-11-10, by Christian Delahousse
revert: allow configuring the .orig file location
2015-11-12, by Christian Delahousse
cmdutil: add origbackuppath helper
2015-11-12, by Christian Delahousse
discovery: pass pushop to _nowarnheads
2015-11-10, by Ryan McElroy
exchange: pass pushop to discovery.checkheads
2015-11-10, by Ryan McElroy
merge with stable
2015-11-12, by Matt Mackall
share: wrap bmstore._writerepo for transaction sensitivity (issue4940) stable
2015-11-13, by FUJIWARA Katsunori
test: use generaldelta in 'test-clonebundle.t'
2015-11-07, by Pierre-Yves David
test: use generaldelta in 'test-ssh.t'
2015-10-20, by Pierre-Yves David
test: use generaldelta in 'test-ssh-bundle1.t'
2015-10-20, by Pierre-Yves David
test: use generaldelta in 'test-strip.t'
2015-10-20, by Pierre-Yves David
test: use generaldelta in 'test-rebase-newancestors.t'
2015-10-20, by Pierre-Yves David
test: use general delta for 'test-commit-amend.t'
2015-10-20, by Pierre-Yves David
test: wider matching in 'test-clone-r.t'
2015-10-20, by Pierre-Yves David
test: use generaldelta in 'test-bundle-type.t'
2015-10-20, by Pierre-Yves David
test: use generaldelta in 'test-patchbomb.t'
2015-10-20, by Pierre-Yves David
test: use generaldelta for test-bundle.t
2015-10-20, by Pierre-Yves David
test: use generaldelta in 'test-rebase-conflict.t'
2015-10-20, by Pierre-Yves David
tests: test generaldelta configuration in test-init.t
2015-10-19, by Pierre-Yves David
test: enable generaldelta early in 'test-treemanifest.t'
2015-10-19, by Pierre-Yves David
test: enable generaldelta in 'test-copy.t'
2015-10-19, by Pierre-Yves David
test: enable generaldelta in 'test-debugcommand.t'
2015-10-18, by Pierre-Yves David
test: use generaldelta in test-manifestv2.t
2015-10-18, by Pierre-Yves David
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
2015-10-18, by Pierre-Yves David
test: using generaldelta in 'test-lfconvert.t'
2015-10-16, by Pierre-Yves David
test: enforce generaldelta format with the right option
2015-11-12, by Pierre-Yves David
test: enforce non-generaldelta base repository in 'test-generaldelta'
2015-11-07, by Pierre-Yves David
test: use generaldelta in 'test-hgweb-command.t'
2015-10-20, by Pierre-Yves David
stream: sort stream capability before serialisation
2015-10-20, by Pierre-Yves David
test: spread capabilities replies in 'test-hgweb-commands'
2015-10-20, by Pierre-Yves David
phase: improve retractboundary perf
2015-11-07, by Durham Goode
merge with stable
2015-11-12, by Matt Mackall
format: introduce 'format.usegeneraldelta`
2015-11-02, by Pierre-Yves David
scmutil: extract general delta config handling in a function
2015-11-02, by Pierre-Yves David
test: test-bundle-type.t needs to work more universally stable
2015-11-10, by Danek Duvall
bash_completion: add -p|--patch|--stat support for shelve
2015-11-10, by Anton Shestakov
test-convert-git: silence commit output for stablity
2015-11-08, by Matt Harbison
rebase: preserve the 'intermediate-source' attribute of grafts
2015-11-08, by Matt Harbison
merge with stable
2015-11-11, by Matt Mackall
verify: add a hook that can let extensions manipulate file lists
2015-11-04, by Augie Fackler
resolve: don't abort when file is missing
2015-11-10, by Siddharth Agarwal
filemerge: treat EOF at prompt as fail, not abort
2015-11-10, by Siddharth Agarwal
test-merge-tools.t: add 'hg resolve --list' output to tests
2015-11-10, by Siddharth Agarwal
error: add structured exception for EOF at prompt
2015-11-10, by Siddharth Agarwal
test-merge-prompt.t: unset HGMERGE
2015-11-09, by Siddharth Agarwal
hgweb: compute changeset parents and children for log pages lazily
2015-11-10, by Anton Shestakov
filemerge: move :merge-local/other symlink check to precheck
2015-11-08, by Siddharth Agarwal
test-merge-types.t: add tests for :merge-local/:merge-other with symlinks
2015-11-08, by Siddharth Agarwal
Added signature for changeset 1aa5083cbebb stable
2015-11-09, by Matt Mackall
Added tag 3.6.1 for changeset 1aa5083cbebb stable
2015-11-09, by Matt Mackall
posix: fix test-permissions regression stable 3.6.1
2015-11-09, by Matt Mackall
dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657) stable
2015-11-08, by Anton Shestakov
dirstate: fix filefoldmap incosistency on file delete stable
2015-11-09, by Mateusz Kwapich
wix: style-coal.css has been renamed stable
2015-11-09, by Steve Borho
merge with stable
2015-11-09, by Matt Mackall
clonebundles: fix typo s/comand/command/ stable
2015-11-05, by Javi Merino
posix: retry on symlink race in checklink stable
2015-11-06, by Matt Mackall
changegroup: back code change of e7c618cee8df out stable
2015-11-06, by Pierre-Yves David
changegroup: call 'prechangegroup' hook before setting up write delay stable
2015-11-06, by Pierre-Yves David
changegroup: fix the scope of a try finally stable
2015-11-06, by Pierre-Yves David
encoding: re-escape U+DCxx characters in toutf8b input (issue4927)
2015-11-05, by Matt Mackall
encoding: use getutf8char in toutf8b
2015-11-05, by Matt Mackall
encoding: handle non-BMP characters in fromutf8b
2015-11-05, by Matt Mackall
posix: use getutf8char to handle OS X filename percent-escaping
2015-11-05, by Matt Mackall
encoding: add getutf8char helper
2015-11-05, by Matt Mackall
unbundle: gratuitous fix white spacing "issue"
2015-11-07, by Pierre-Yves David
demandimport: fix level passed to loader of sub-modules stable
2015-11-01, by Yuya Nishihara
parsers: fix width of datalen variable in fm1readmarkers stable
2015-11-07, by Yuya Nishihara
manifest: skip fastdelta if the change is large
2015-11-05, by Durham Goode
merge.mergestate: update docstrings for preresolve and resolve
2015-11-04, by Siddharth Agarwal
rebase: pass date parameter to concludenode
2015-10-26, by Stanislau Hlebik
rebase: add date parameter to concludenode function
2015-10-26, by Stanislau Hlebik
hgweb: remove unused colorPart() from mercurial.js
2015-10-24, by Anton Shestakov
test: enforce non-general delta in 'test-generaldelta.t'
2015-10-18, by Pierre-Yves David
test: enforce bundle1 in 'test-push-cgi.t'
2015-10-20, by Pierre-Yves David
test: enforce v1 in 'test-debugbundle.t'
2015-10-18, by Pierre-Yves David
test: enforce bundle1 in "test-commit-interactive.t"
2015-10-20, by Pierre-Yves David
discovery: factor out calculation of heads to not warn about
2015-11-06, by Ryan McElroy
hooks: back 9f272bf3b342 out stable
2015-11-06, by Pierre-Yves David
merge with stable
2015-11-04, by Matt Mackall
hooks: fix hooks not firing if prechangegroup was set (issue4934) stable
2015-11-03, by Durham Goode
hooks: always include HG_PENDING stable
2015-11-03, by Durham Goode
wireproto: move clonebundles command from extension (issue4931) stable
2015-11-03, by Gregory Szorc
templatefilters: try round-trip utf-8 conversion by json filter (issue4933) stable
2015-11-04, by Yuya Nishihara
exchange: do not attempt clone bundle if local repo is non-empty (issue4932) stable
2015-11-03, by Gregory Szorc
test-clonebundles.t: add test for incremental pull stable
2015-11-03, by Gregory Szorc
i18n: make sure to include translation of (DEPRECATED) stable
2015-11-03, by Yuya Nishihara
i18n: do not abuse msgstr of "DEPRECATED" to check for bad translation stable
2015-11-03, by Yuya Nishihara
filemerge.prompt: separate out choice selection and action
2015-11-02, by Siddharth Agarwal
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
2015-11-02, by Siddharth Agarwal
test-pathencode.py: drop support for Python 2.4
2015-10-24, by Siddharth Agarwal
hgweb.server: drop support for Python 2.4
2015-10-24, by Siddharth Agarwal
util: drop Python 2.4 compat by directly importing md5 and sha1
2015-10-24, by Siddharth Agarwal
hgweb: replace some str.split() calls by str.partition() or str.rpartition()
2015-11-02, by Anton Shestakov
help: replace some str.split() calls by str.partition() or str.rpartition()
2015-11-02, by Anton Shestakov
convert: test clean p2 file missing
2015-10-24, by Mads Kiilerich
uescape: also encode non-printable char under 128
2015-11-02, by Pierre-Yves David
testing: add hypothesis fuzz testing
2015-10-24, by David R. MacIver
merge with stable
2015-11-02, by Pierre-Yves David
Added signature for changeset 47dd34f2e727 stable
2015-11-01, by Matt Mackall
Added tag 3.6 for changeset 47dd34f2e727 stable
2015-11-01, by Matt Mackall
i18n: look translation of both "DEPRECATED" and "(DEPRECATED)" up stable 3.6
2015-11-01, by FUJIWARA Katsunori
i18n: fix regexp pattern to detect translation for DEPRECATED stable
2015-11-01, by FUJIWARA Katsunori
scmutil: abort if an empty revision is given to revpair() stable
2015-10-31, by Matt Harbison
i18n-pt_BR: synchronized with a9ed5a8fc5e0 stable
2015-11-01, by Wagner Bruna
i18n-ja: synchronized with 6474b64045fb stable
2015-11-01, by FUJIWARA Katsunori
packaging: rework version detection and declaration (issue4912) stable
2015-10-26, by Augie Fackler
hgweb: escape class keyword when used as a js object property (issue4913) stable
2015-10-27, by Anton Shestakov
localrepo: discard objects in _filecache at transaction failure (issue4876) stable
2015-10-24, by FUJIWARA Katsunori
demandimport: fix TypeError when importing Python regex library (issue4920) stable
2015-10-28, by Gábor Stefanik
bundle2: attribute remote failures to remote (issue4788) stable
2015-10-24, by Gregory Szorc
tests: add tests for remote hook output (issue4788) stable
2015-10-24, by Gregory Szorc
help: mention alias and revsetalias in description of HGPLAINEXCEPT stable
2015-10-24, by Yuya Nishihara
debugrevlog: cope with empty revlog files stable
2015-10-23, by Augie Fackler
largefiles: don't mute and obfuscate http errors when putlfile fails stable
2015-10-23, by Mads Kiilerich
largefiles: test coverage of error handling from putlfile stable
2015-10-23, by Mads Kiilerich
largefiles: check hash of files in the store before copying to working dir stable
2015-10-23, by Mads Kiilerich
largefiles: test coverage of handling of store corruption stable
2015-10-23, by Mads Kiilerich
merge: improve clarity of table in update docstring stable
2015-10-23, by Augie Fackler
ui: support paths.default-push without paths.default set (issue4914) stable
2015-10-22, by Gregory Szorc
bookmarks: don't allow pushing new head for existing mark with -B (issue4400) stable
2015-10-21, by Matt Mackall
commands: fix help for debugobsolete stable
2015-10-20, by timeless
largefiles: fix explicit commit of normal/largefile switch stable
2015-10-21, by Mads Kiilerich
largefiles: test coverage of explicit commit of normal/largefile switch stable
2015-10-21, by Mads Kiilerich
Added signature for changeset b66e3ca0b90c stable
2015-10-20, by Matt Mackall
Added tag 3.6-rc for changeset b66e3ca0b90c stable
2015-10-20, by Matt Mackall
merge default into stable for code freeze stable 3.6-rc
2015-10-20, by Matt Mackall
convert: fix Python syntax in 'splice in' message
2015-10-19, by Mads Kiilerich
rebase: fix wrong 'no changes to commit' when using --collapse
2015-10-19, by Mads Kiilerich
pull: all pass along extra opargs
2015-10-19, by Sean Farley
push: all pass along opargs
2015-10-19, by Sean Farley