Push without private commits

[mdrssv]

Hi,

A while ago I've been told in an issue that this would be possible, so I've tried:

jj git push -r "root()::feature-branch ~ (description(glob:'wip:*') | description(glob:'private:*'))" --allow-new

and failed, the private commits still end up on the remote. Which makes me wonder if what I'm trying is even possible,

jj log -r "root()::feature-branch ~ (description(glob:'wip:*') | description(glob:'private:*'))" 

shows the graph I'm expecting. But push I assume just pushes all ancestors of all revs captured by the revset which will then include the private ones.

Did I miss something or is it just not possible?

[jennings]

The private commits feature doesn't automatically rebase away private commits on push. The purpose is to block pushing if a private commit would be sent to the remote.

Perhaps you are using private commits to store things like config file changes for local development? If so, you're probably interested in this FAQ: How can I keep my scratch files in the repository without committing them?

[mdrssv]

Perhaps you are using private commits to store things like config file changes for local development? If so, you're probably interested in this FAQ: How can I keep my scratch files in the repository without committing them?

I'm already using an similar workflow, which is pretty manual imo. Would rebasing them away be hard to implement? I'm willing to give it a shot.

[jennings]

You could try, but I'm not sure it's a good fit for jj. It raises a lot of questions. For example:

• Today, bookmarks show a * when they differ from their tracked remote bookmarks. Does this indicator show up immediately if you push a bookmark this way? If so, that seems like a strange UI. If not, then jj will either need to save the commit ID that was pushed somewhere, or do a lot of calculation on the fly just to decide whether to show the *.

• What if you change the git.private-commits setting? If jj cached anything to make the above faster, all that needs to be invalidated somehow.

• Does 'jj diff -f foo@origin -t foo` remove private commits first?

I am not sure the complexity justifies having the feature. Maybe others disagree, this is just my opinion.

[martinvonz]

@mdrssv: I'm confused about whether you actually had configured those commits to be private.

[mdrssv]

@mdrssv: I'm confused about whether you actually had configured those commits to be private.

Yes:

[git]
private-commits = "description(glob:'wip:*') | description(glob:'private:*')"