repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Make git-p4 work with bare repositories.
2007-05-15
Simon Hausmann
Make git-p4 work with bare repositories
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
Si
m
o
n Hausmann
Fix git
-
p4 clo
n
e //depot/project (he
a
d import)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
M
a
rius S
t
o
rm-Ols
e
n
Make the command call si
l
e
nt
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hausmann
Converted to un
i
x
newline
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Haus
m
a
nn
Make submitti
n
g work o
n
Window
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausma
n
n
Make sure a
l
l popen c
a
ll
s
use binary
mode (for
W
i
n
dows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon
Haus
m
a
n
n
Added
a
lit
t
le
.
ba
t
wrapper from
M
a
r
iu
s
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Use t
h
e subproce
s
s module
i
nstead of popen2
to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
S
i
mon Hausman
n
Docum
e
nt some
i
mpleme
n
tation de
t
ai
l
s, for the cu
r
i
o
us
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Ha
u
smann
Cle
a
nup, re
m
oved the old
t
agging code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
H
a
us
m
an
n
cleanup, renamed s
e
l
f
.
globalPre
f
ix to self
.
d
e
potPa
t
h
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Micro cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
Doc clea
n
ups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Sim
o
n
H
a
usmann
Handle patch
e
rrors in
g
it-
p
4 submit b
e
tter
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simo
n
Ha
u
smann
A new attemp
t
a
t
fixing t
h
e child-fast-import-p
r
o
cess
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simo
n
H
a
usmann
Slightly improved
f
orm
a
tting
of
the raw_
i
nput questions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Rem
o
v
ed
the
old patch apply code
from gi
t
-p4
s
ub
m
it
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Ha
u
s
m
ann
Fix
t
he
t
imezone
f
o
rma
t
ting
.
Now qgit also disp
l
ays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
S
i
mon Hausmann
Print an er
r
o
r
message of so
m
e
sort if git
f
ast-import
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Simon
Hau
s
mann
Allow
for convenient rebasing
after
git-p4 sub
m
it
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on H
a
usmann
Added a
simple exampl
e
o
f
usage to
t
he "document
a
tion" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
H
a
usmann
f
i
x vari
a
ble
u
sage
(oops
)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Si
m
on Hau
s
mann
Fix fil
e
deter
m
i
n
a
t
i
on for #hea
d
import
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simo
n
Hausma
n
n
Added git-p4
c
l
o
ne convenience comma
n
d
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
S
imon Hausmann
H
o
nor
-
-
silent for l
a
b
e
l
s
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
S
i
mon Hausma
n
n
Turn off pot
e
ntially s
l
ow label detec
t
ion by d
e
fault
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausmann
Provide
a
tre
e
sum
m
ary after git-p4
rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
au
s
mann
A
dded git
-
p4 rebase convenie
n
ce
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausm
a
n
n
Clean up python cla
s
s
name
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Si
m
on Hausmann
Fix
"
compilation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simon H
a
us
m
ann
Fix the docs for git-p4 submit and t
u
rn git-p
4
su
b
mit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
S
i
mon Hausmann
Fix
v
ariable us
a
g
e
i
n tag impo
r
t
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Haus
m
an
n
Add
e
d support for mappin
g
p4 labe
l
s to git tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Haus
m
ann
g
i
t-p4
d
ebug
doesn't
n
eed a git repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Sim
o
n
H
aus
m
a
nn
Don't try
t
o parse any optio
n
s wi
t
h git-p4 d
e
bug but
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
ausmann
Pref
e
r git comm
a
n
d over git
-
command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on Haus
m
ann
Minor cosmetic
fixlet for
the git-p4 subm
i
t s
y
nc questi
o
n
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon Hausman
n
Different versions of p4
have different
outp
u
t
f
or
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Hausmann
Use t
h
e new increm
e
n
tal import style by defau
l
t
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
S
i
m
o
n Ha
u
sman
n
Make it
possible
t
o run git-p4 submi
t
fr
o
m within
the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausmann
B
r
and new smart
i
ncrementa
l
i
m
port that doesn't need
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausmann
Se
t
the de
f
aul
t
bra
n
c
h
in run
,
not in
the construct
o
r
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausma
n
n
Helper
fun
c
tion
t
o check the exista
n
ce of a
re
v
ision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Hausman
n
Added
s
ome helper functio
n
(
s) to parse the de
p
ot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Ch
a
nged
the def
a
ult branch for
i
m
ports from
"master
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Ch
a
nged th
e
forma
t
of the imported log message slightl
y
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simo
n
Hausmann
Removed the
.
py extension from git-p
4
as it
'
s annoying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausmann
D
o
n
'
t show t
h
e submit templat
e
an
d
the diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
S
i
mon Hausmann
Make
it possibl
e
to invoke gi
t
-p4 from
w
i
thin subdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausman
n
Made --a
p
ply-as-pat
c
h the defa
u
l
t
for git
-
p4 submit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Ha
u
s
m
ann
Fix support for deletions in
git-p4 submit
w
hen usi
n
g
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Added e
x
perimental but super-fast --apply-
a
s-pa
t
ch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n Hausman
n
Doc
u
mentation enhancements
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
Si
m
on Ha
u
smann
Start
o
f the git-p4 documen
t
ation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
im
o
n
Hausm
a
nn
Remove
d
p4-fast-export and p4-git-sy
n
c
as
th
e
y've bee
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
S
imon
Hausman
n
Fixed the initial version i
m
port by get
t
ing the
file
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
H
ausmann
Ad
d
ed missing "s
e
lf"s
t
o
m
ak
e
the script e
v
aluate cor
r
ectly
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
mann
Completely
u
ntested "me
r
g
e" o
f
p4
-
fast-expo
r
t
.
py int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
sync-t
o
-perforce is now called submit
and
fixed the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n Hausmann
P
art of the code is copyrig
h
t by Tr
o
l
ltec
h
ASA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Sim
o
n H
a
u
s
ma
n
n
First
(untested) attempt at migrating p4-gi
t
-
sync int
o
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hausman
n
Provide a little
bit of help
d
e
scr
i
ption for the git
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausma
n
n
Start mo
v
i
n
g the
git-p4 tools into one single script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
S
i
mon Hausmann
Pass the r
i
ght number of
a
rguments t
o
commit, fi
x
es
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simo
n
Hausmann
Improved the
git dir detection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Sim
o
n Hausmann
Defau
l
t
to int
e
r
a
ctiv
e
syncin
g
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Simon Hausmann
Use p4
revert
.
.
.
in
s
tead of revert -a
.
.
.
a
fter subm
i
tting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
S
i
mon Hausmann
Auto-d
e
tect
the c
u
rrent git
b
r
anch before submitting
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
imo
n
H
ausmann
Ignore
A
ppl
e
re
s
ource
files
w
hen
im
p
orting
from perfor
c
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
S
im
o
n H
a
usmann
Be nice a
n
d
use /usr
/
bin/e
n
v pyth
o
n
fo
r
the
g
it-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Au
t
omaticall
y
ope
r
ate o
n
a temporary bra
n
ch
,
need
e
d
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
m
on Haus
m
ann
Lots
of bugfixes
t
o
p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Sim
o
n Hausmann
Fix git-dir option and
allow read
i
ng log substi
t
u
ti
o
ns
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Sim
o
n H
a
usman
n
First v
e
rsion of a new script
t
o
submit changes back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Split up the cac
h
e
commandl
i
ne opti
o
ns i
n
to (c
o
mmand
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simo
n
Hausmann
Re
d
u
c
e the number
of false "
m
e
r
g
es" by skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
More work o
n
br
a
nch
d
etectio
n
by implementing changeIsBranch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
More code cleanups
a
nd p
r
eparati
o
ns for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
s
m
an
n
Minor code
cl
e
anups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon
Hau
s
mann
Make the p4 data/command cac
h
e
configurable through
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon
H
ausm
a
nn
Fixed p4-debug
f
ile extens
i
on
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
S
imon
H
ausmann
C
h
anged -
-
know
n
-branc
h
e
s to take a file as argumen
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Work in progress on det
e
cting branches
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
S
i
m
on H
a
usmann
Adjust the output parsin
g
of git name-rev to handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
S
i
mon Hausman
n
Don't print
a
p
lain newline at t
h
e end
o
f
the executio
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
More work in --sile
n
t support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n Hausmann
Added
sup
p
ort for --silent so that
p4-fast-export
c
a
n
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
S
i
mon Hausma
n
n
Add
e
d p4 del
e
t
e
be
h
avioural emulatio
n
as todo item
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-17
Simon Haus
m
ann
Fix single-branc
h
imports b
y
skipping the bra
n
c
h
/
m
erge
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausm
a
n
n
Use sets
.
Set(
)
i
nstead of set()
to run also w
i
t
h olde
r
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-14
Simon Hausma
n
n
Mak
e
it po
s
sible to specify the p4 changes to import
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausm
a
nn
Wh
e
n trying to map p4 integ
r
ati
o
n
s
to git merg
e
s just
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
S
i
m
on Hausmann
Set git f
a
st-import
marks
f
o
r
every
impo
r
ted change
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausma
n
n
After marking
a
p4 branch as
merged don't ever merge
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
Hausmann
More fixes i
n
heuristic p4 bra
n
ch detection based on
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon Hausmann
Sta
r
t
ed work
o
n
p4
branch detect
i
on (expe
r
imental!)
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-12
Simon
H
a
u
smann
Code cleanups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Si
m
on Hau
s
m
ann
Cle
a
nu
p
s, remove unu
s
ed var
i
able
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-11
Simon Hausmann
Create
l
ightweight git tags
(
using
t
he "reset
"
tric
k
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-02-10
Si
m
on Hausmann
Added a little helper script to
remove
unused tags
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
next