Mercurial > hg
graph
-
readmarkers: combine parent conditionalsSat, 10 Jan 2015 21:25:07 -0600, by Matt Mackall
-
readmarkers: drop temporary substring assignmentsSat, 10 Jan 2015 21:24:45 -0600, by Matt Mackall
-
util: introduce unpackerSat, 10 Jan 2015 21:18:31 -0600, by Matt Mackall
-
perf: add a configurable sleep on startupSat, 10 Jan 2015 21:13:10 -0600, by Matt Mackall
-
revset: use localrepo revbranchcache for branch name filteringThu, 08 Jan 2015 00:01:03 +0100, by Mads Kiilerich
-
branchmap: use revbranchcache when updating branch mapThu, 08 Jan 2015 00:01:03 +0100, by Mads Kiilerich
-
branchcache: introduce revbranchcache for caching of revision branch namesThu, 08 Jan 2015 00:01:03 +0100, by Mads Kiilerich
-
hgweb: move archive entries outside of <li> in monoblue styleFri, 09 Jan 2015 22:53:38 +0800, by Anton Shestakov
-
hgweb: add searchhint to templates/coal/mapFri, 09 Jan 2015 15:24:55 +0800, by Anton Shestakov
-
largefiles: enable subrepo support for removeTue, 30 Dec 2014 21:12:52 -0500, by Matt Harbison
-
transplant: properly skip empty changeset (issue4423)Thu, 08 Jan 2015 21:36:12 -0800, by Pierre-Yves David
-
color: add support for colorizing git subrepo diffsThu, 08 Jan 2015 21:30:22 +0100, by Mathias De Maré
-
tests: fix test-casefolding.t outputThu, 08 Jan 2015 23:33:56 -0500, by Matt Harbison
-
synthrepo: new filenames must not also be new directories, and vice-versaFri, 12 Dec 2014 17:42:14 +0000, by Mike Edgar
-
status: don't override _buildstatus() in workingcommitctxThu, 08 Jan 2015 13:29:06 -0800, by Martin von Zweigbergk
-
status: cache dirstate status in _dirstatestatus()Thu, 08 Jan 2015 13:12:44 -0800, by Martin von Zweigbergk
-
localrepo: add ignoremissing parameter to branchtipThu, 16 Oct 2014 21:49:28 -0700, by Sean Farley
-
namespaces: add method to return a list of nodes for a given nameMon, 15 Dec 2014 14:46:04 -0800, by Sean Farley
-
namespaces: add test for logTue, 21 Oct 2014 19:49:23 -0700, by Sean Farley
-
log: use new namespaces api to display namesFri, 17 Oct 2014 09:26:37 -0700, by Sean Farley
-
tests: add a i18n translation test for log outputWed, 31 Dec 2014 16:50:19 -0600, by Sean Farley
-
filectx: fix annotate to not directly instantiate filectxFri, 09 Jan 2015 11:21:29 -0800, by Durham Goode
-
largefiles: don't print files as both large and normal in addremove dryrunsWed, 31 Dec 2014 18:39:41 -0500, by Matt Harbison
-
largefiles: return the list of added files from addlargefiles()Wed, 31 Dec 2014 18:31:18 -0500, by Matt Harbison
-
largefiles: align the output messages for an added file with core methodsFri, 28 Nov 2014 21:44:41 -0500, by Matt Harbison
-
largefiles: align the output messages for a removed file with core methodsFri, 28 Nov 2014 21:03:44 -0500, by Matt Harbison
-
revset: use '%' as an operator for 'only'Thu, 06 Nov 2014 14:55:18 -0800, by Sean Farley
-
transaction: support for callbacks during abortTue, 06 Jan 2015 21:56:33 -0800, by Gregory Szorc
-
debugnamecomplete: use new name apiMon, 15 Dec 2014 14:11:19 -0800, by Sean Farley
-
debugnamecomplete: rename from debuglabelcompleteFri, 17 Oct 2014 13:41:29 -0700, by Sean Farley
-
namespaces: add __iter__ and iteritems methodsMon, 22 Dec 2014 09:07:37 -0800, by Sean Farley
-
namespaces: add 'listnames' propertyMon, 15 Dec 2014 14:09:00 -0800, by Sean Farley
-
test-bundle2-exchange: create temp script in $TESTTMP, not $TESTDIRWed, 07 Jan 2015 14:30:40 -0800, by Martin von Zweigbergk
-
manifest: drop withflags() method, which is now unusedWed, 07 Jan 2015 15:55:02 -0500, by Augie Fackler
-
context: use new manifest.diff(clean=True) supportMon, 15 Dec 2014 16:06:04 -0500, by Augie Fackler
-
manifest: add optional recording of clean entries to diffMon, 15 Dec 2014 16:04:28 -0500, by Augie Fackler
-
context: use manifest.diff() to compute most of statusMon, 15 Dec 2014 15:33:55 -0500, by Augie Fackler
-
trydiff: replace dodiff=True/'binary' by binarydiff=False/TrueWed, 07 Jan 2015 11:02:10 -0800, by Martin von Zweigbergk
-
trydiff: replace 'dodiff = False' by 'continue'Wed, 07 Jan 2015 10:59:40 -0800, by Martin von Zweigbergk
-
trydiff: make addindexmeta() unconditionally add index metaWed, 07 Jan 2015 08:54:26 -0800, by Martin von Zweigbergk
-
trydiff: remove unused code for git index of "combined diff"Wed, 07 Jan 2015 08:46:52 -0800, by Martin von Zweigbergk
-
diff: remove dead assignmentTue, 06 Jan 2015 22:55:01 -0800, by Martin von Zweigbergk
-
localrepo: show headline notes in commitctx before showing filenamesFri, 18 Apr 2014 13:33:20 +0200, by Mads Kiilerich
-
bundle: when verbose, show what takes up the space in the generated bundleFri, 15 Aug 2014 19:43:32 +0200, by Mads Kiilerich
-
setdiscovery: factorize similar sampling codeTue, 06 Jan 2015 16:30:52 -0800, by Pierre-Yves David
-
setdiscovery: drop shadowed 'undecided' assignmentTue, 06 Jan 2015 16:30:37 -0800, by Pierre-Yves David
-
hgweb: extract changelist entry generation into own functionTue, 06 Jan 2015 20:14:52 -0800, by Gregory Szorc
-
templates: use CSS classes for diff stylingTue, 06 Jan 2015 15:29:02 -0800, by Gregory Szorc
-
templates: remove unnecessary <span>Tue, 06 Jan 2015 15:21:48 -0800, by Gregory Szorc
-
revset: introduce new operator "##" to concatenate strings/symbols at runtimeTue, 06 Jan 2015 23:46:18 +0900, by FUJIWARA Katsunori
-
largefiles: pass a matcher instead of a raw file list to removelargefiles()Fri, 28 Nov 2014 19:50:52 -0500, by Matt Harbison
-
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)Sat, 03 Jan 2015 17:50:21 +0800, by Anton Shestakov
-
namespaces: remove templatename method on the namespaces objectSun, 21 Dec 2014 14:34:07 -0800, by Sean Farley
-
namespaces: remove names method on the namespaces objectSun, 21 Dec 2014 14:04:20 -0800, by Sean Farley
-
templatekw: update namespace callsSun, 21 Dec 2014 14:01:52 -0800, by Sean Farley
-
namespaces: add __getitem__ propertySun, 21 Dec 2014 13:56:32 -0800, by Sean Farley
-
merge with stableTue, 06 Jan 2015 18:18:28 -0600, by Matt Mackall
-
cmdutil.jsonchangeset: properly compute added and removed files stableMon, 05 Jan 2015 22:18:55 -0800, by Gregory Szorc
-
largefiles: convert addlargefiles() to vfsWed, 31 Dec 2014 18:18:56 -0500, by Matt Harbison
-
rebase: clarify comment about merge ancestor when rebasing mergesSun, 04 Jan 2015 01:29:07 +0100, by Mads Kiilerich
-
status: don't list files as both clean and deletedMon, 05 Jan 2015 17:12:04 -0800, by Martin von Zweigbergk
-
status: don't list files as both removed and deletedMon, 05 Jan 2015 16:52:12 -0800, by Martin von Zweigbergk
-
revset-filelog: handle hidden linkrev for file missing for head (issue4490)Tue, 06 Jan 2015 11:23:38 -0800, by Pierre-Yves David
-
run-tests: automatically add (glob) to "saved backup bundle to" linesThu, 27 Nov 2014 02:04:30 +0100, by Mads Kiilerich
-
transaction: use the right location when cleaning up backup file (issue4479)Mon, 05 Jan 2015 15:00:02 -0800, by Pierre-Yves David
-
merge with stableMon, 05 Jan 2015 15:46:14 -0600, by Matt Mackall
-
revset: delay showing parse error for the revset alias until it is referredMon, 05 Jan 2015 11:02:04 +0900, by FUJIWARA Katsunori
-
revset: drop pre-lazyset optimization for stringset of subset == entire repo stableSat, 03 Jan 2015 10:25:08 +0900, by Yuya Nishihara
-
keyword: update copyright yearSat, 03 Jan 2015 11:12:44 +0000, by Christian Ebert
-
keyword: use vfs.reljoin and util.unlinkpath to remove kwdemoSat, 03 Jan 2015 11:11:46 +0000, by Christian Ebert
-
largefiles: properly sync lfdirstate after removing largefiles stableSun, 04 Jan 2015 15:26:26 -0500, by Matt Harbison
-
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)Mon, 29 Dec 2014 18:35:23 -0800, by Pierre-Yves David
-
linkrev: work around linkrev to filtered entry in 'filelog' revsetMon, 29 Dec 2014 17:23:16 -0800, by Pierre-Yves David
-
namespaces: update documentation and code indentationSun, 21 Dec 2014 13:06:24 -0800, by Sean Farley
-
namespaces: use namespace object instead of dictionaryFri, 19 Dec 2014 17:27:20 -0800, by Sean Farley
-
namespaces: copy implementation to new namespace objectFri, 19 Dec 2014 17:17:17 -0800, by Sean Farley
-
namespaces: add a namespace objectFri, 19 Dec 2014 17:00:28 -0800, by Sean Farley
-
localrepo: use vfs.reljoin rather than os.path.join in the localrepository classFri, 02 Jan 2015 13:30:38 +0100, by Angel Ezquerra
-
largefiles: drop a redundant check for patterns when removing without --afterWed, 26 Nov 2014 19:28:11 -0500, by Matt Harbison
-
context: override _dirstatestatus in workingcommitctx for correct matchingWed, 31 Dec 2014 17:55:43 +0900, by FUJIWARA Katsunori
-
context: avoid breaking already fixed self._status at ctx.status()Wed, 31 Dec 2014 17:55:43 +0900, by FUJIWARA Katsunori
-
context: add workingcommitctx for exact context to be committedWed, 31 Dec 2014 17:55:43 +0900, by FUJIWARA Katsunori
-
context: make unknown/ignored/clean of cached status empty for equivalenceWed, 31 Dec 2014 17:55:43 +0900, by FUJIWARA Katsunori
-
templatefilters.json: stabilize outputWed, 31 Dec 2014 13:48:55 -0800, by Gregory Szorc
-
templatefilters.json: call functionsWed, 31 Dec 2014 11:22:17 -0800, by Gregory Szorc
-
merge with stableThu, 01 Jan 2015 16:47:14 -0600, by Matt Mackall
-
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)Wed, 24 Dec 2014 03:26:48 -0800, by Pierre-Yves David
-
linkrev: also adjust linkrev when bootstrapping 'follow' revsetMon, 29 Dec 2014 23:40:24 -0800, by Pierre-Yves David
-
linkrev: introduce an 'introrev' method on filectxTue, 23 Dec 2014 16:14:39 -0800, by Pierre-Yves David
-
filectx.parents: enforce changeid of parent to be in own changectx ancestorsTue, 23 Dec 2014 15:30:38 -0800, by Pierre-Yves David
-
context: remove unreliable accessor methods from committablectxWed, 31 Dec 2014 17:55:43 +0900, by FUJIWARA Katsunori
-
context: cache self._status correctly at workingctx.statusWed, 31 Dec 2014 17:55:43 +0900, by FUJIWARA Katsunori
-
filectx.parents: also fetch the filelog of rename source tooTue, 23 Dec 2014 18:30:46 -0800, by Pierre-Yves David
-
largefiles: backout f72d73937853 - linear updates handle m -> a differently stable 3.2.4Wed, 31 Dec 2014 14:46:03 +0100, by Mads Kiilerich
-
largefiles: mark lfile as added in lfdirstate when the standin is added stableWed, 31 Dec 2014 14:46:02 +0100, by Mads Kiilerich
-
tests: add test coverage for lfdirstate invalidation of linear update stableWed, 31 Dec 2014 14:45:02 +0100, by Mads Kiilerich
-
test-subrepo-git: ignore global git configTue, 30 Dec 2014 15:51:14 -0600, by Matt Mackall
-
tests/autodiff.py: explicitly only honor feature diffoptsFri, 21 Nov 2014 16:02:26 -0800, by Siddharth Agarwal
-
cmdutil.changeset_printer: explicitly honor all diffoptsFri, 21 Nov 2014 16:01:55 -0800, by Siddharth Agarwal
-
export: explicitly honor all diffoptsTue, 18 Nov 2014 22:21:03 -0800, by Siddharth Agarwal
-
webcommands.annotate: explicitly only honor whitespace diffoptsFri, 21 Nov 2014 16:16:03 -0800, by Siddharth Agarwal
-
filectx.parents: filter nullrev parent soonerTue, 23 Dec 2014 18:29:03 -0800, by Pierre-Yves David
-
context: catch FilteredRepoLookupError instead of RepoLookupErrorTue, 23 Dec 2014 17:13:51 -0800, by Pierre-Yves David
-
narrowmatcher: propagate the rel() methodThu, 27 Nov 2014 10:16:56 -0500, by Matt Harbison
-
match: add the abs() methodFri, 28 Nov 2014 20:15:46 -0500, by Matt Harbison
-
merge with stableMon, 29 Dec 2014 16:39:20 -0600, by Matt Mackall
-
posix: quote the specified string only when it may have to be quotedThu, 25 Dec 2014 23:33:26 +0900, by FUJIWARA Katsunori
-
windows: quote the specified string only when it has to be quotedThu, 25 Dec 2014 23:33:26 +0900, by FUJIWARA Katsunori
-
extdiff: rename the name of an argument for readabilityThu, 25 Dec 2014 23:33:26 +0900, by FUJIWARA Katsunori
-
extdiff: avoid unexpected quoting arguments for external tools (issue4463)Thu, 25 Dec 2014 23:33:26 +0900, by FUJIWARA Katsunori
-
subrepo: add forgotten annotation for reverting git subreposSun, 28 Dec 2014 23:59:57 +0100, by Mathias De Maré
-
subrepo: add full revert support for git subreposSun, 28 Dec 2014 10:42:25 +0100, by Mathias De Maré
-
setup: don't fail when Python doesn't have the cygwinccompiler packageTue, 23 Dec 2014 19:54:48 -0800, by Ludovic Chabant
-
tests: adapt glob pattern to fix test with NetBSD's sh(1) (issue4484)Sun, 28 Dec 2014 23:50:08 +0100, by Thomas Klausner
-
tests: run 'cvs init' only on non-existent directories (issue4482)Sun, 28 Dec 2014 21:30:52 +0100, by Thomas Klausner
-
remove: use vfs instead of os.path + match.rel() for filesystem checksThu, 25 Dec 2014 21:50:35 -0500, by Matt Harbison
-
forget: use vfs instead of os.path + match.rel() for filesystem checksThu, 25 Dec 2014 21:43:45 -0500, by Matt Harbison
-
tests: make a multi-statement hook in bundle2-exchange Windows compatibleWed, 24 Dec 2014 12:07:59 -0500, by Matt Harbison
-
merge with stableMon, 29 Dec 2014 13:10:47 -0600, by Matt Mackall
-
i18n-ja: synchronized with 3b84bde06d17 stableMon, 29 Dec 2014 15:59:56 +0900, by FUJIWARA Katsunori
-
localrepo: use the vfs join method to implement the localrepo join methodTue, 23 Dec 2014 19:48:38 +0100, by Angel Ezquerra
-
localrepo: introduce shared method to check if a repository is sharedSun, 21 Dec 2014 00:19:10 +0100, by Angel Ezquerra
-
trydiff: use 'ctx1.flags()' for symmetry with 'ctx2.flags()'Tue, 23 Dec 2014 16:16:26 -0800, by Martin von Zweigbergk
-
trydiff: use 'not in addedset' for symmetry with 'not in removedset'Tue, 23 Dec 2014 16:25:00 -0800, by Martin von Zweigbergk
-
trydiff: simplify checking for additionsTue, 23 Dec 2014 16:12:54 -0800, by Martin von Zweigbergk
-
trydiff: extract 'date2' variable like existing 'date1'Tue, 23 Dec 2014 14:56:30 -0800, by Martin von Zweigbergk
-
trydiff: use sets, not lists, for containment checksTue, 23 Dec 2014 10:41:45 -0800, by Martin von Zweigbergk
-
largefiles: fix unused importWed, 24 Dec 2014 13:33:01 -0600, by Matt Mackall
-
largefiles: look at unfiltered().lfstatus to allow status() to be filteredSun, 07 Dec 2014 01:32:30 -0500, by Matt Harbison
-
largefiles: eliminate a duplicate message when removing files in verbose modeFri, 28 Nov 2014 14:21:02 -0500, by Matt Harbison
-
largefiles: ensure that the standin files are available in getlfilestoupload()Wed, 17 Dec 2014 21:51:09 -0500, by Matt Harbison
-
merge: move checking of unknown files out of manifestmerge()Thu, 18 Dec 2014 09:22:09 -0800, by Martin von Zweigbergk
-
merge: extract method for checking for conflicting untracked fileSat, 13 Dec 2014 23:52:22 -0800, by Martin von Zweigbergk
-
merge: create 'cm' action for 'get or merge' caseMon, 15 Dec 2014 16:45:19 -0800, by Martin von Zweigbergk
-
merge: don't overwrite untracked file at directory rename targetFri, 12 Dec 2014 23:18:36 -0800, by Martin von Zweigbergk
-
merge: remove constant tuple element from 'aborts'Tue, 18 Nov 2014 20:29:25 -0800, by Martin von Zweigbergk
-
merge: collect checking for unknown files at end of manifestmerge()Wed, 19 Nov 2014 11:51:31 -0800, by Martin von Zweigbergk
-
merge: introduce 'c' action like 'g', but with additional safetyWed, 19 Nov 2014 11:48:30 -0800, by Martin von Zweigbergk
-
merge: structure 'remote created' code to match tableWed, 19 Nov 2014 11:44:00 -0800, by Martin von Zweigbergk
-
pushkey: run hook after the lock releaseMon, 22 Dec 2014 15:48:39 -0800, by Pierre-Yves David
-
setup: use changes since latest tag instead of just distanceFri, 12 Dec 2014 15:31:28 -0800, by Siddharth Agarwal
-
setup: use changessincelatesttag from archive if presentFri, 12 Dec 2014 15:29:39 -0800, by Siddharth Agarwal
-
archive: store number of changes since latest tag as wellFri, 12 Dec 2014 15:27:13 -0800, by Siddharth Agarwal
-
merge with stableMon, 22 Dec 2014 17:26:21 -0600, by Matt Mackall
-
demandimport: blacklist distutils.msvc9compiler (issue4475) stableMon, 22 Dec 2014 17:27:31 -0500, by Augie Fackler
-
largefiles: don't duplicate 'actions' into 'actionbyfile'Thu, 11 Dec 2014 22:51:29 -0800, by Martin von Zweigbergk
-
merge: make calculateupdates() return file->action dictThu, 11 Dec 2014 22:07:41 -0800, by Martin von Zweigbergk
-
merge: let _forgetremoved() work on the file->action dictThu, 11 Dec 2014 21:58:49 -0800, by Martin von Zweigbergk
-
merge: let _resolvetrivial() work on the file->action dictThu, 11 Dec 2014 21:06:16 -0800, by Martin von Zweigbergk
-
merge: let bid merge work on the file->action dictThu, 11 Dec 2014 20:56:53 -0800, by Martin von Zweigbergk
-
merge: write manifestmerge() using dictionary with entry per fileMon, 08 Dec 2014 13:24:10 -0800, by Martin von Zweigbergk
-
repoview: backout ced3ecfc2e57Wed, 17 Dec 2014 12:21:07 -0800, by Pierre-Yves David
-
largefile: explain why no monkey patching on a repoviewWed, 17 Dec 2014 12:19:33 -0800, by Pierre-Yves David
-
largefile: backout ca54fb3d71ceWed, 17 Dec 2014 12:10:16 -0800, by Pierre-Yves David
-
incoming: handle phases the same as pullThu, 18 Dec 2014 12:33:17 -0800, by Eric Sumner
-
bundlerepo: retract phase boundaryThu, 18 Dec 2014 12:22:43 -0800, by Eric Sumner
-
bundlerepo: implement safe phasecacheThu, 18 Dec 2014 11:38:48 -0800, by Eric Sumner
-
localrepo.__getitem__: add slicing supportThu, 18 Dec 2014 11:30:10 -0800, by Eric Sumner
-
ignore: resolve ignore files relative to repo root (issue4473) (BC)Tue, 16 Dec 2014 14:34:53 -0800, by Siddharth Agarwal
-
test-hgignore: add testing for ui.ignoreWed, 17 Dec 2014 18:53:38 -0800, by Siddharth Agarwal
-
tests: add missing globs for WindowsWed, 10 Dec 2014 22:09:46 -0500, by Matt Harbison
-
share: use the 'sharedpath' attr on repo instead of reloading from the fileThu, 18 Dec 2014 23:24:17 -0500, by Matt Harbison
-
share: fix source repo lookup on WindowsThu, 18 Dec 2014 23:16:37 -0500, by Matt Harbison
-
help: suggest '-v -e' to get built-in aliases for extensions (issue4461)Mon, 22 Dec 2014 03:20:50 +0100, by Chingis Dugarzhapov
-
test-check-commit-hg: clarify misleading "commit message rules" errorThu, 18 Dec 2014 10:11:38 -0800, by Martin von Zweigbergk
-
keyword: handle resolve to either parentSun, 21 Dec 2014 13:02:59 +0000, by Christian Ebert
-
keyword: update test file syntaxSun, 21 Dec 2014 12:53:57 +0000, by Christian Ebert
-
branches: deprecate -aMon, 22 Dec 2014 14:49:05 -0600, by Matt Mackall
-
largefiles: fix a spurious missing file warning with forget (issue4053) stableSun, 21 Dec 2014 15:06:54 -0500, by Matt Harbison
-
largefiles: fix a spurious missing file warning with 'remove -A' (issue4053) stableSun, 21 Dec 2014 15:04:13 -0500, by Matt Harbison
-
largefiles: introduce the 'composelargefilematcher()' method stableSun, 21 Dec 2014 14:42:46 -0500, by Matt Harbison
-
context: return dirstate parents in workingctx.ancestors()Thu, 18 Dec 2014 09:37:14 -0800, by Durham Goode
-
backout: add --commit optionWed, 17 Dec 2014 17:26:12 -0800, by Mateusz Kwapich
-
share: add option to share bookmarksSat, 13 Dec 2014 11:32:46 -0800, by Ryan McElroy
-
highlight: ignore Unicode's extra linebreaks (issue4291)Wed, 17 Dec 2014 13:25:24 -0600, by Matt Mackall
-
test: fix typo in test-help.tThu, 18 Dec 2014 21:53:55 +0100, by André Sintzoff
-
templatekw: remove unneeded showtagsMon, 15 Dec 2014 09:40:02 -0800, by Sean Farley
-
namespaces: generate template keyword when registering a namespaceThu, 16 Oct 2014 23:19:09 -0700, by Sean Farley
-
templatekw: add helper method to generate a template keyword for a namespaceSun, 14 Dec 2014 19:15:37 -0800, by Sean Farley
-
namespaces: add names method to return list of names for a given nodeSun, 14 Dec 2014 18:54:50 -0800, by Sean Farley
-
namespaces: add nodemap propertyMon, 15 Dec 2014 00:24:23 -0800, by Sean Farley
-
namespaces: add method to get template name of namespaceSun, 14 Dec 2014 19:12:27 -0800, by Sean Farley
-
namespaces: add template name of a namespaceMon, 15 Dec 2014 00:09:52 -0800, by Sean Farley
-
memctx: remove redundant test for issue4470 from test-commit.tFri, 19 Dec 2014 00:11:56 +0900, by FUJIWARA Katsunori
-
memctx: calculate manifest more efficientlyFri, 19 Dec 2014 00:11:56 +0900, by FUJIWARA Katsunori
-
merge with stableThu, 18 Dec 2014 16:41:59 -0600, by Matt Mackall