bzr: Ignore attributes when committing / pulling

Question

I have one system with msys2, and another system with Ubuntu. Files in Unix have the executable attribute. Files in msys2 (NTFS based) do not have the executable attribute (although msys2 "fakes" it by looking for the shebang in the first line of each file, at least for ls).

When exchanging files with bzr (via commit, e.g.), I would like bzr to ignore the executable attribute as a parameter for determining what to commit. Otherwise, when committing from my msys2 system I would mess the repository.

Is this possible?

EDIT: Actually, msys2 does not have other attributes as well, so I would like to ignore all that differs from Unix.

jelmer · Answer 1 · 2020-04-03T19:18:48.010

0

On Windows, Bazaar ignores the executable bit based on the sys.platform variable. However, apparently that's not set to win32 on msys2 but to msys2. You can manually fix this in Bazaar by changing the supports_executable() function in bzrlib/osutils.py from:

return sys.platform != "win32"

to

return sys.platform not in ("win32", "msys", "msys2")

Newer versions of Breezy, the successor to Bazaar, address this by not reading the executable bit from the filesystem if the filesystem (e.g. FAT, NTFS, etc) does not support executable bits rather than checking sys.platform.

edited Apr 03 '20 at 19:18

answered Apr 02 '20 at 16:45

jelmer

2,405
14
27

So you mean that I will constantly have that problem with bzr-msys2 <-> bzr<->Linux? Any workaround? – sancho.s ReinstateMonicaCellio Apr 02 '20 at 20:59
Actually, it looks like this is something specific to msys2. Updated my comment. – jelmer Apr 03 '20 at 02:17
1) I guess your changed line should be negated to match the behavior above, is that correct? 2) I did not get the outcome. Do you mean that, by default, bzr in Windows already does what I intend, but I should only implement the change you suggested to get the intended behaviour in msys2? – sancho.s ReinstateMonicaCellio Apr 03 '20 at 07:22
Your answer is very interesting, as it likely applies to other apps in msys2 – sancho.s ReinstateMonicaCellio Apr 03 '20 at 07:24
In my case, `sys.platform` is `'msys'`. – sancho.s ReinstateMonicaCellio Apr 03 '20 at 07:27
Oops, yes - I've updated it to negate. Thanks. The default installer for Bazaar on Windows already behaves this way, but msys2 apparently identifies itself as a different platform, which is why the behaviour doesn't kick in. – jelmer Apr 03 '20 at 19:19

bzr: Ignore attributes when committing / pulling

1 Answers1