paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-08 01:56:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

svn2revisioninc: fix my earlier sloppy code to find out the main git branch name

Browse Source 
git-svn-id: trunk@32847 -
This commit is contained in:
juha 2011-10-12 11:44:08 +00:00
parent f4f2ae1e2e
commit b358c98210
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/svn2revisioninc.pas
View File

@ -421,11 +421,12 @@ end;
function TSvn2RevisionApplication.IsThisGitUpstreamBranch: boolean;
const
cBufSize = 1024;
MainBranchNames: array[0..1] of string = ('upstream', 'master');
var
p: TProcessUTF8;
Buffer: string;
s: string;
i: integer;
i, j: integer;
n: LongInt;
sl: TStringList;
begin
@ -447,24 +448,20 @@ begin
s := s + Copy(Buffer, 1, n);
until n < cBufSize;
sl.Text := s;
// now search for the active branch marker '*' symbol
// Search for the active branch marker '*' symbol.
// Guess the main branch name. Support 'master' and 'upstream'.
MainBranch := '';
for i := 0 to sl.Count-1 do
begin
s := sl[i];
// Guess the main branch name. 'master' takes precedence if both are defined.
if (MainBranch = '') then begin
if Pos('master', s) > 0 then
MainBranch := 'master'
else if Pos('upstream', s) > 0 then
MainBranch := 'upstream';
if (MainBranch <> '') and (s[1] = '*') then
begin
for i := 0 to sl.Count-1 do begin
for j := Low(MainBranchNames) to High(MainBranchNames) do begin
if Pos(MainBranchNames[j], sl[i]) > 0 then begin
MainBranch := MainBranchNames[j];
if sl[i][1] = '*' then begin
Result := True;
exit;
end;
end;
end;
end;
except
// ignore error, default result is false
end;