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

Add Pijul support to Cargo #3842

Merged
merged 1 commit into from
Apr 1, 2017
Merged

Conversation

pwoolcoc
Copy link
Contributor

@pwoolcoc pwoolcoc commented Mar 17, 2017

Pijul is a version control system written in Rust. This commit adds the ability to create a cargo project using pijul as the vcs for the project.

To use it, run cargo new my-awesome-project --vcs=pijul

@rust-highfive
Copy link

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

Cargo.toml Outdated
@@ -1,23 +1,19 @@
[package]
name = "cargo"
Copy link
Member

Choose a reason for hiding this comment

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

You seem to have a tool or something that automatically reformatted this file and reordered everything. It makes the diff harder to understand because at face value it looks like you made changes you didn't make. Could you avoid making cosmetic changes to code you don't need to change for this PR?

Copy link

Choose a reason for hiding this comment

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

It looks like he ran cargo-edit on it (killercup/cargo-edit#15).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, exactly right. I didn't realize how much it had affected Cargo.toml. I've fixed and re-pushed.

@lthms
Copy link

lthms commented Mar 20, 2017

Does this PR support external crates which use pijul as their DVCS?

@pwoolcoc
Copy link
Contributor Author

@lethom this is only for cargo new. I was planning on tackling dependencies from pijul repos next, but that's a much bigger project.

@pwoolcoc pwoolcoc force-pushed the add-pijul-vcs-support branch 2 times, most recently from 17ce2a9 to aa0cfa2 Compare March 22, 2017 20:25
@pwoolcoc
Copy link
Contributor Author

@alexcrichton sorry to bother you, this has been open for a week so I thought I would check in and see if you've had a chance to look at it yet. Thanks!

@bb010g
Copy link

bb010g commented Mar 24, 2017

You might want to rebase aa0cfa2 on top of master and get rid of that empty merge commit.

@alexcrichton
Copy link
Member

Thanks @pwoolcoc! I wonder if this could perhaps just be done using the command line vs pulling in more dependencies? The git dependencies are primarily pulled in for dependency management, not for initialization.

@pwoolcoc
Copy link
Contributor Author

@alexcrichton that is definitely possible. I was planning on tackling pijul-repos-as-dependencies next, so I imagine the dependencies will have to be there eventually, if I manage to get that feature in, but I don't mind taking them out of this PR.

@alexcrichton
Copy link
Member

Ok, yeah let's cross that bridge when we get there. Adding full-blown support for repositories is a pretty weighty PR though. There's a huge amount of support for git and mirroring that for a separate VCS is a nontrivial investment. We may want to discuss a bit before we support pijul dependencies as well.

@pwoolcoc
Copy link
Contributor Author

@alexcrichton ok, that makes sense. I'll pull the dependency out of this PR and just use Command.

Should I maybe open an RFC for adding pijul support for dependencies?

@pwoolcoc
Copy link
Contributor Author

@alexcrichton alright, changed the pijul support to look more like the hg support. Let me know if there's anything else you want me to change.

@bors
Copy link
Collaborator

bors commented Mar 31, 2017

☔ The latest upstream changes (presumably #3878) made this pull request unmergeable. Please resolve the merge conflicts.

[Pijul](https://pijul.org) is a version control system written in Rust. This commit adds the ability to create a cargo project using pijul as the vcs for the project.

To use it, run `cargo new my-awesome-project --vcs=pijul`
@alexcrichton
Copy link
Member

Looks good to me, thanks!

@bors: r+

@bors
Copy link
Collaborator

bors commented Apr 1, 2017

📌 Commit 2b31978 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Apr 1, 2017

⌛ Testing commit 2b31978 with merge 4729175...

bors added a commit that referenced this pull request Apr 1, 2017
Add Pijul support to Cargo

[Pijul](https://pijul.org) is a version control system written in Rust. This commit adds the ability to create a cargo project using pijul as the vcs for the project.

To use it, run `cargo new my-awesome-project --vcs=pijul`
@bors
Copy link
Collaborator

bors commented Apr 1, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 4729175 to master...

@bors bors merged commit 2b31978 into rust-lang:master Apr 1, 2017
bors added a commit that referenced this pull request Jun 14, 2017
Add fossil VCS support to `cargo new`

Fossil is a simple, high-reliability, distributed software configuration management system <https://www.fossil-scm.org/>

I mostly followed #3842 as a template. Like that one, this only adds support for `cargo new`, not for pulling down fossil-hosted dependencies

A problem that i didn't tackle but I'd be willing to is a little more more `trait`ifying of the VCSs. I would need some guidance on that since it looks like git has some more thorough support than e.g. hg does but it looks pretty doable
@porky11
Copy link

porky11 commented Dec 18, 2018

cargo fix doesn't recognize pijul yet

@ehuss ehuss added this to the 1.18.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants