Page MenuHomePhabricator
Feed Advanced Search

Yesterday

durin42 committed rHG03ba7de6a8b9: git: add coverage for manifest.diff() so we don't regress.
git: add coverage for manifest.diff() so we don't regress
Wed, Jun 3, 11:31 AM

Mon, Jun 1

durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Mon, Jun 1, 11:50 AM
durin42 updated the diff for D8557: debugcommands: get mergestate via context.
Mon, Jun 1, 11:50 AM

Sat, May 30

durin42 closed D8590: githelp: add some minimal help for pickaxe functionality.
Sat, May 30, 12:24 PM
durin42 committed rHG94f227baa76f: githelp: add some minimal help for pickaxe functionality.
githelp: add some minimal help for pickaxe functionality
Sat, May 30, 12:23 PM

Fri, May 29

durin42 closed D8592: filemerge: add __bytes__ for absentfilectx.
Fri, May 29, 1:06 PM
durin42 committed rHGaa790f7c967a: filemerge: add __bytes__ for absentfilectx.
filemerge: add __bytes__ for absentfilectx
Fri, May 29, 1:06 PM
durin42 closed D8591: mergestate: move staticmethod _filectxorabsent to module level.
Fri, May 29, 1:06 PM
durin42 committed rHG17d928f8abaf: mergestate: move staticmethod _filectxorabsent to module level.
mergestate: move staticmethod _filectxorabsent to module level
Fri, May 29, 1:06 PM

Thu, May 28

durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Thu, May 28, 5:34 PM
durin42 added a comment to D8567: mergestate: implement trivial in-memory mergestate.

This is now much closer! I'm down to a handful of failures, all like this:

Thu, May 28, 5:12 PM
durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Thu, May 28, 5:10 PM
durin42 updated the diff for D8565: mergestate: optimize unresolvedcount() a little bit.
Thu, May 28, 5:10 PM
durin42 updated the diff for D8591: mergestate: move staticmethod _filectxorabsent to module level.
Thu, May 28, 5:09 PM
durin42 updated the diff for D8504: diff: add experimental support for "merge diffs".
Thu, May 28, 4:28 PM
durin42 updated the diff for D8566: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())).
Thu, May 28, 4:28 PM
durin42 updated the diff for D8568: overlayworkingctx: implement mergestate() using in-memory mergestate.
Thu, May 28, 4:27 PM
durin42 updated the diff for D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.
Thu, May 28, 4:27 PM
durin42 updated the diff for D8563: localrepo: get mergestate via context.
Thu, May 28, 4:27 PM
durin42 updated the diff for D8556: commands: get mergestate via context.
Thu, May 28, 4:27 PM
durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Thu, May 28, 4:27 PM
durin42 updated the diff for D8565: mergestate: optimize unresolvedcount() a little bit.
Thu, May 28, 4:26 PM
durin42 updated the diff for D8555: cmdutil: get mergestate via context.
Thu, May 28, 4:26 PM
durin42 created D8592: filemerge: add __bytes__ for absentfilectx.
Thu, May 28, 4:26 PM
durin42 created D8591: mergestate: move staticmethod _filectxorabsent to module level.
Thu, May 28, 4:25 PM
durin42 added a comment to D8576: help: fix description of revlog version 2.

ha!

Thu, May 28, 11:39 AM
D8589: metadata: filter the `removed` set to only contains relevant data is now accepted and ready to land.
Thu, May 28, 11:38 AM
D8588: files: extract code for extra filtering of the `removed` entry into copies is now accepted and ready to land.
Thu, May 28, 11:38 AM
D8587: metadata: move computation related to files touched in a dedicated module now requires changes to proceed.
Thu, May 28, 11:37 AM
durin42 created D8590: githelp: add some minimal help for pickaxe functionality.
Thu, May 28, 10:05 AM

Tue, May 26

D8579: context: avoid computing status twice when comparing among revisions now requires changes to proceed.

Breaks many tests for status code, sadly.

Tue, May 26, 12:37 PM
durin42 added a comment to D8586: files: speed up `hg files` when no flags change display.

Doesn't this break HGPLAIN=1 hg files -T'{path|short}\n' or similar?

Tue, May 26, 12:24 PM
durin42 committed rHGb7808443ed6a: mergestate: split out merge state handling code from main merge module.
mergestate: split out merge state handling code from main merge module
Tue, May 26, 12:18 PM
durin42 committed rHGe607099d8b93: context: implement mergestate() method.
context: implement mergestate() method
Tue, May 26, 12:18 PM
durin42 committed rHG1d2d353e5c4a: tests: add coverage for repo.changelog.children() in the git extension.
tests: add coverage for repo.changelog.children() in the git extension
Tue, May 26, 12:18 PM
durin42 committed rHGba5688e3b3bd: relnotes: add API change note per request in D8502.
relnotes: add API change note per request in D8502
Tue, May 26, 12:18 PM
durin42 committed rHG572f98a6f6af: tests: add coverage for repo.changelog.findmissing() in test-git-interop.t.
tests: add coverage for repo.changelog.findmissing() in test-git-interop.t
Tue, May 26, 12:18 PM
D8585: scmutil: speed up relativization of paths when it's a no-op is now accepted and ready to land.

I can see some room for improvement in the log message, but it's good enough IMO and I can't really figure out a better wording.

Tue, May 26, 12:16 PM
durin42 added a comment to D8577: graft-state: add test to document problem with graft --continue, after --base.

I don't see the changes as having been folded: there are changes in 8578 that aren't here. Missed a phabsend maybe?

Tue, May 26, 12:12 PM

Wed, May 20

durin42 closed D8550: mergestate: split out merge state handling code from main merge module.
Wed, May 20, 8:24 PM
durin42 closed D8551: context: implement mergestate() method.
Wed, May 20, 8:19 PM
durin42 committed rHGf3b69aecfdc3: context: implement mergestate() method.
context: implement mergestate() method
Wed, May 20, 8:19 PM
durin42 committed rHG2870f5d5c977: mergestate: split out merge state handling code from main merge module.
mergestate: split out merge state handling code from main merge module
Wed, May 20, 8:19 PM
durin42 committed rHGbdb95edb2ac6: relnotes: add API change note per request in D8502.
relnotes: add API change note per request in D8502
Wed, May 20, 8:19 PM
durin42 closed D8549: relnotes: add API change note per request in D8502.
Wed, May 20, 8:19 PM
durin42 closed D8548: tests: add coverage for repo.changelog.children() in the git extension.
Wed, May 20, 8:13 PM
durin42 committed rHG0a76833c0cfc: tests: add coverage for repo.changelog.children() in the git extension.
tests: add coverage for repo.changelog.children() in the git extension
Wed, May 20, 8:13 PM
durin42 closed D8547: tests: add coverage for repo.changelog.findmissing() in test-git-interop.t.
Wed, May 20, 8:13 PM
durin42 committed rHGfb91393818e5: tests: add coverage for repo.changelog.findmissing() in test-git-interop.t.
tests: add coverage for repo.changelog.findmissing() in test-git-interop.t
Wed, May 20, 8:13 PM

Tue, May 19

durin42 updated the diff for D8550: mergestate: split out merge state handling code from main merge module.
Tue, May 19, 3:56 PM
durin42 created D8572: merge: remove special case for in-memory merge.
Tue, May 19, 3:53 PM
durin42 updated the diff for D8567: mergestate: implement trivial in-memory mergestate.
Tue, May 19, 3:52 PM
durin42 added a comment to D8563: localrepo: get mergestate via context.

Yeah, I'm happy to reorder patches, this is still a bit "work-in-progress unfortunately.

Tue, May 19, 3:18 PM
durin42 added a comment to D8552: fix: use context to fetch mergestate instead of loading it directly.

I think I'd prefer to leave code that doesn't use overlayworkingctx unchanged. I don't see any reason to get the merge state from the context if we know that the context is a regular workingctx.

Tue, May 19, 3:17 PM

Mon, May 18

durin42 created D8550: mergestate: split out merge state handling code from main merge module.
Mon, May 18, 6:13 PM
durin42 updated the diff for D8504: diff: add experimental support for "merge diffs".
Mon, May 18, 6:11 PM
durin42 created D8566: cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved())).
Mon, May 18, 6:11 PM
durin42 created D8570: rebase: use context to load mergestate instead of loading it directly.
Mon, May 18, 6:10 PM
durin42 updated the diff for D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.
Mon, May 18, 6:10 PM
durin42 created D8568: overlayworkingctx: implement mergestate() using in-memory mergestate.
Mon, May 18, 6:10 PM
durin42 created D8569: merge: get mergestate from context instead of directly.
Mon, May 18, 6:10 PM
durin42 created D8563: localrepo: get mergestate via context.
Mon, May 18, 6:09 PM
durin42 created D8567: mergestate: implement trivial in-memory mergestate.
Mon, May 18, 6:09 PM
durin42 created D8565: mergestate: optimize unresolvedcount() a little bit.
Mon, May 18, 6:09 PM
durin42 created D8564: fakemergerecord: get mergestate via context.
Mon, May 18, 6:09 PM
durin42 created D8561: hg: get mergestate via context.
Mon, May 18, 6:09 PM
durin42 created D8562: shelve: get mergestate via context.
Mon, May 18, 6:09 PM
durin42 created D8556: commands: get mergestate via context.
Mon, May 18, 6:09 PM
durin42 created D8559: revset: get mergestate via context.
Mon, May 18, 6:09 PM
durin42 created D8560: templatekw: get mergestate via context.
Mon, May 18, 6:09 PM
durin42 created D8557: debugcommands: get mergestate via context.
Mon, May 18, 6:08 PM
durin42 created D8558: fileset: get mergestate via context.
Mon, May 18, 6:08 PM
durin42 created D8555: cmdutil: get mergestate via context.
Mon, May 18, 6:08 PM
durin42 created D8553: histedit: use context to load mergestate instead of loading it directly.
Mon, May 18, 6:07 PM
durin42 created D8551: context: implement mergestate() method.
Mon, May 18, 6:07 PM
durin42 created D8554: strip: get mergestate via context.
Mon, May 18, 6:07 PM
durin42 created D8552: fix: use context to fetch mergestate instead of loading it directly.
Mon, May 18, 6:07 PM
durin42 updated the diff for D8353: debugcommands: create new debugantivirusrunning command.
Mon, May 18, 1:23 PM
durin42 created D8549: relnotes: add API change note per request in D8502.
Mon, May 18, 1:18 PM
D8536: flags: also test merge with executable bit removed is now accepted and ready to land.
Mon, May 18, 1:01 PM
D8535: flags: also test the removal of the exec flag is now accepted and ready to land.
Mon, May 18, 1:01 PM
D8534: flags: read flag from dirstate/disk for workingcopyctx (issue5743) is now accepted and ready to land.
Mon, May 18, 1:01 PM
D8533: flags: actually merge flags in simplemerge is now accepted and ready to land.
Mon, May 18, 1:01 PM
D8532: flags: add a test for merging exec flag change with rename and file change is now accepted and ready to land.
Mon, May 18, 1:01 PM
D8531: flags: account for flag change when tracking rename relevant to merge is now accepted and ready to land.
Mon, May 18, 1:01 PM
D8530: flags: also test merging a rename with and exec flag change is now accepted and ready to land.
Mon, May 18, 1:01 PM
durin42 added a comment to D8529: flags: introduce explicit testing for merging change to exec flag.

I'm okay with the series, but I'm a little hesitant to put something this big on stable. Can you sway me one way or the other?

Mon, May 18, 12:59 PM
durin42 created D8548: tests: add coverage for repo.changelog.children() in the git extension.
Mon, May 18, 12:49 PM
durin42 created D8547: tests: add coverage for repo.changelog.findmissing() in test-git-interop.t.
Mon, May 18, 12:49 PM
durin42 added a comment to D8480: bundle: make obsolescence parts optional.

This patch is contentious, but I'm a little unclear why. Summarizing so everyone at least parses my thoughts roughly the way I mean: mandatory parts mean "fail if you can't process this part." It seems basically reasonable to me that a client can choose to ignore (perhaps through ignorance) obsolete markers and it'll be potentially confusing, but not /wrong/ in that they'll have the changesets they expected, but also didn't lose some the server thought they would. It feels like a bug if a client requests obsmarkers and then discards them? But in the case of any kind of pre-computed bundle it's a little trickier because if the server (as an optimization, in this case) emits obsmarkers that the client didn't request, it could break old clients.

Mon, May 18, 11:39 AM

Sun, May 17

durin42 added a comment to D8540: git: implement some changelog methods.

I assume this fixed ... something? Is there any test you could add to one of the test-git*.t tests that would demonstrate that?

Sun, May 17, 9:25 PM

Thu, May 14

durin42 updated subscribers of D8489: rebase: avoid clobbering wdir() with --dry-run or --confirm (issue6291).

Seems fine to me, but I want one of @martinvonz or @marmoute to look at this.

Thu, May 14, 4:27 PM
durin42 accepted D8488: tests: show that rebase --dry-run and --confirm wipeout uncommitted changes.
Thu, May 14, 4:27 PM

Wed, May 13

durin42 committed rHG6d3768b11241: diff: avoid going from contexts to nodes and back.
diff: avoid going from contexts to nodes and back
Wed, May 13, 9:46 AM

Tue, May 12

durin42 closed D8502: cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat.
Tue, May 12, 8:22 PM
durin42 closed D8503: diff: avoid going from contexts to nodes and back.
Tue, May 12, 8:21 PM
durin42 committed rHG8c0c1161614e: diff: avoid going from contexts to nodes and back.
diff: avoid going from contexts to nodes and back
Tue, May 12, 8:20 PM
durin42 committed rHG3b7aabd02e11: cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat.
cleanup: avoid extra node/ctx conversions in logcmdutil.diffordiffstat
Tue, May 12, 8:20 PM

Mon, May 11

durin42 updated the diff for D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs.
Mon, May 11, 6:55 PM
durin42 added a comment to D8504: diff: add experimental support for "merge diffs".

For anyone curious what's left, the test currently fails like this:

Mon, May 11, 6:49 PM