Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitAndTools.git-fast-export: 190107 -> 200213, fix #87227

Merged
merged 2 commits into from Aug 23, 2020

Conversation

risicle
Copy link
Contributor

@risicle risicle commented May 8, 2020

Motivation for this change

Turns out this was broken, probably by a mercurial bump to a py3k version. Fixed & bumped (still no py3k support in a released version though). Added an installCheckPhase so this doesn't happen again.

Would be good to get a working version of this out (maybe to stable?) what with the bitbucket mercurial shutdown approaching.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@risicle
Copy link
Contributor Author

risicle commented May 8, 2020

@GrahamcOfBorg build gitAndTools.git-fast-export

fixing involves providing it with mercurial_4 (and implicitly python27 -
current released fast-export doesn't support py3 yet) and adding git to
the wrapped PATH. this shouldn't be a runtime-resolved dependency.
$out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash
for s in "foo" "bar" "baz" ; do
(${git}/bin/git show | grep $s > /dev/null) && echo $s found
done
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to popd here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I'll add it for symmetry.

this creates and converts a simple hg repository - should stop us
inadvertently breaking this package.
@callahad
Copy link
Member

LGTM with the caveat that I've carefully read but have not actually run the code

@risicle
Copy link
Contributor Author

risicle commented Aug 23, 2020

Good enough for me, seeing as I clearly was the first person to try using this in n months.

@risicle risicle merged commit 40ae9e7 into NixOS:master Aug 23, 2020
@callahad
Copy link
Member

Good enough for me, seeing as I clearly was the first person to try using this in n months.

👍 That's how I got roped into this last year, too (#60653)...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants